# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110126081028-v3rublf9e9dtedm0 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 00d2df0d1037876414adc3b2f850c636ff1fa32f # timestamp: 2011-01-26 10:14:58 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20110125224940-\ # ou7e1rruc2se7jpl # # Begin bundle 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