# 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 13:27:35 +0200 # base_revision_id: marko.makela@oracle.com-20101221093919-\ # mcmmgd4zpse9567d # # Begin bundle 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