# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: epotemkin@mysql.com-20091020073238-kmwrtl2zl61v4zys # target_branch: file:///work/bzrroot/mysql-next-mr-bugfixing/ # testament_sha1: f349f817056e9f06ff60517ff180bdd3e1e45d3c # timestamp: 2009-10-20 11:32:48 +0400 # source_branch: file:///work/bzrroot/30302-bp-next-mr-bugfixing/ # base_revision_id: guilhem@mysql.com-20091019132342-1kemmxjirsktmvvm # # Begin bundle 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 Icpk/oyuD/xdyRThQkH6kjfQ