# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@oracle.com-20100928145313-7rfelsuzmjhwants # target_branch: file:///home/bm136801/my/mtr-nx/ # testament_sha1: 703950c9ea9504129d23f82487030e7a58c36b37 # timestamp: 2010-09-28 16:55:01 +0200 # source_branch: file:///home/bm136801/my/mysql-next-mr/ # base_revision_id: bjorn.munch@oracle.com-20100921092317-\ # dfpitgo40vcpwthr # # Begin bundle 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 kU4UJAq0h1NA