# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110405071843-dr6mbq0wokqdxl9m # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 25fcdb5a00d8c3eed6d078c7438e082e3044eef0 # timestamp: 2011-04-05 10:18:56 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110404062838-\ # kqan4256fe7rsgiz # # Begin bundle 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