# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110412062243-1h0zori8j3my3tp0 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: b4dfa7fe5e4c67c33bce262eca21c043f352189e # timestamp: 2011-04-12 11:11:27 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110411140332-\ # 77i0fzy77266ovtl # # Begin bundle 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 KEhXzaJngA==