# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110125075618-2y2dncnbm8ynzjy7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: b117faa080639ad7584bde78943026f04cca9bc6 # timestamp: 2011-01-25 09:56:28 +0200 # base_revision_id: vasil.dimov@oracle.com-20110124074037-\ # 4iplz5cggkleefvi # # Begin bundle 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 yF3/Evf/xdyRThQkM9HcikA=