# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: luis.soares@sun.com-20100316235914-shu43xylcftndvu9 # target_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\ # /51426/push/mysql-next-mr-bugfixing/ # testament_sha1: 989365e1a6a58fc464fc431e8b6fd65d63125b29 # timestamp: 2010-03-16 23:59:23 +0000 # source_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\ # /51426/push/mysql-trunk-bugfixing/ # base_revision_id: mattias.jonsson@sun.com-20100316170714-\ # 3up135a0wq3qxje8 # # Begin bundle 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 bMEupMkQP+i7kinChIdLaPYI