# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: vasil.dimov@oracle.com-20100623071721-l8mend26quaybmwb # target_branch: file:///usr/local/devel/bzrroot/server/mysql-trunk-\ # innodb/ # testament_sha1: 1c8eee47f93e1ba6e0e216503d793dd265e4d03e # timestamp: 2010-06-23 10:20:45 +0300 # source_branch: file:///usr/local/devel/bzrroot/server/mysql-trunk-\ # bugfixing/ # base_revision_id: marko.makela@oracle.com-20100622120533-\ # yki7l4uo5kw0fu6e # # Begin bundle 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 u5IpwoSHlFEb+A==