# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100817120754-98rp2bojkw5f38nf # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: be901dc712988a05b8f00a767c9e98d61b530728 # timestamp: 2010-08-17 15:08:01 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100817115429-\ # yppvmphc2g3kj8kv # # Begin bundle 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