# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110207140721-\ # yfsg5kraz61uxrcl # target_branch: file:///export/home/jl208045/mysql/mysql-trunk-59793/ # testament_sha1: 03afcf0daca3f0d0a30d8f5e97a8ab2323d1cf5d # timestamp: 2011-02-07 15:07:25 +0100 # base_revision_id: tor.didriksen@oracle.com-20110207130347-\ # lmjksir7xpbf3sth # # Begin bundle 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 sSF3sMtVF9alQtjSmDH/hkP+LuSKcKEgwIsX/g==