# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100826213248-g4h4f0skktqsg0mx # target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\ # merge/ # testament_sha1: 578d49d4957ecf706a66571fd4c3c13f0ca257c8 # timestamp: 2010-08-26 15:33:05 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing/ # base_revision_id: chris.powers@oracle.com-20100826165806-\ # bm5k5m5r3qn6tnar # # Begin bundle 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