# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100622104317-5xl3suwp1hqjtd80 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 42637d2aac6c210255d21bb6e413f6c9e38d0b1c # timestamp: 2010-06-22 13:43:48 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: inaam.rana@oracle.com-20100621155209-\ # 1pu7nwq05x7tbfoo # # Begin bundle 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 0awr+A==