# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101029150008-s8hi48eer5g7efov # target_branch: file:///export/home/x/mysql-next-mr-bugfixing-\ # bug57035/ # testament_sha1: c608446a53ebef4627575c07de47b33dafe2f80e # timestamp: 2010-10-29 17:00:30 +0200 # base_revision_id: tor.didriksen@oracle.com-20101029130026-\ # ufwv9cr0gjbpqzl9 # # Begin bundle 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 P/xdyRThQkP+h+rI