# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110202121249-lfh1mihf8725vvx7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 7bfddce40f31a704e156908943da79334918bf11 # timestamp: 2011-02-02 14:12:57 +0200 # base_revision_id: marko.makela@oracle.com-20110202121012-\ # bqpq712rw169zkb3 # # Begin bundle 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