# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110127081906-7hcdqfavguz71spq # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 9f6a5b7cdf715e6c3c9d03b0925b4c24e6acccb7 # timestamp: 2011-01-27 10:21:22 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110126081028-\ # v3rublf9e9dtedm0 # # Begin bundle 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