# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110131075651-0394t3ppr6ao2es3 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 834cfebd433356439cca896419883172bcbfbcfd # timestamp: 2011-01-31 09:57:00 +0200 # base_revision_id: vasil.dimov@oracle.com-20110130171552-\ # treg04y89ktust1h # # Begin bundle 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 ckU4UJCzID3b