# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100413143009-xay3250b7hlh0jvv # target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\ # 45355/ # testament_sha1: 32b7b7f8be23897f9e9bca156b750000ab4f23d9 # timestamp: 2010-04-13 08:30:40 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ # base_revision_id: vvaintroub@mysql.com-20100413121636-\ # rlr8geenii0rupl2 # # Begin bundle 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 Ldyo