# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101221112722-1yxxzzgqtem8bcm7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 486af86f867406f378ca9d48ec1d8102c8b64f17 # timestamp: 2010-12-21 14:55:56 +0200 # base_revision_id: vasil.dimov@oracle.com-20101214093819-\ # wb2offmkgzcz2725 # # Begin bundle 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 L//V5A==