# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100426105215-2e9nzq8z0nfwxjky # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 1d0ee02b0db0874fc79cf52a41595e1632ff3a0d # timestamp: 2010-04-26 13:53:48 +0300 # base_revision_id: vasil.dimov@oracle.com-20100426083557-\ # k1o7mb5sf7v1ysps # # Begin bundle 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 ChIUOe9yoA==