# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110127113059-g5s3u7pdce5ps6g1 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: cce538907ee4d5d6fb74bb8d1968c2f3b7dfb15b # timestamp: 2011-01-27 13:48:11 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110126080252-\ # vlp173hj98x1orek # # Begin bundle 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