# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100824083419-ciowjldbt806j5zu # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: e4d06d7d5debb9e30a6c5f585fd9a08f4c5dc6fb # timestamp: 2010-08-24 11:36:45 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: inaam.rana@oracle.com-20100820163904-\ # vdwn6uflh3ymvwau # # Begin bundle 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