# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110324120014-hk1iw529qxj6lveq # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 0bb938642b024ba5259febb5eca65a091f9052a8 # timestamp: 2011-03-24 14:00:30 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110322113916-\ # oricw02qg3tzvim8 # # Begin bundle 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