# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110125101728-5m22qrw5558pimj0 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 605d63f135efd4bead65be4c0063a9013c4d7bae # timestamp: 2011-01-25 12:57:56 +0200 # base_revision_id: vasil.dimov@oracle.com-20110124074037-\ # 4iplz5cggkleefvi # # Begin bundle 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 ADF0IHbQvxfjan/xzP739hdyRThQkPDXDj8=