# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110330113707-2m1jy8d9gsszumzd # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 50989da0331ed811aaebdf977c4b35c5ec388f98 # timestamp: 2011-03-30 14:38:39 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110324120014-\ # hk1iw529qxj6lveq # # Begin bundle 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