# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20110211132334-\ # r936bvz6p9i95glr # target_branch: file:///export/home/didrik/repo/5.5-bug60085nulltime/ # testament_sha1: 84703176d1991ad3b9532c441b4841b77a69371a # timestamp: 2011-02-11 14:23:40 +0100 # base_revision_id: alexander.barkov@oracle.com-20110210133818-\ # 9sxqewix0fg8c50j # # Begin bundle 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