# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100819122614-2fi2ulv4c7b3sq9q # target_branch: file:///home/marko/innobase/dev/mysql2a/next-mr/ # testament_sha1: 3d1d4a039462fb398fa85134707eefc1a7cf5a30 # timestamp: 2010-08-19 15:27:07 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100819111836-\ # c2x51ninj4wors8u # # Begin bundle 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