# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101213152245-7i8915q3ffv31liy # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 287d21de3a07bdc9c5d6a79e7a81cae989e9f6c4 # timestamp: 2010-12-13 17:44:20 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20101213131841-\ # 8rtst40im6s15lhz # # Begin bundle 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 F3JFOFCQGMgLJg==