# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101201130902-q0g54ufii06or4oe # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 5880e2b15bbcf2095338c7f86609470090fad565 # timestamp: 2010-12-01 15:09:13 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101201084333-\ # c5ilkrewqblfopg7 # # Begin bundle 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