# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20101109143429-nrwginhdpwliyush # target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\ # merge/ # testament_sha1: 74371fd9469f6a4de51775bf2314842250e2823c # timestamp: 2010-11-09 15:34:39 +0100 # source_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing/ # base_revision_id: tor.didriksen@oracle.com-20101109120220-\ # xqcrwt6lequcvx9u # # Begin bundle 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 cAeNDqDeBlb68FTnfLy6X/4u5IpwoSGbj00+