# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110202135108-k5qqvri13bw85dsv # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: af3398260db13cc846559e889984aed6a7ce1472 # timestamp: 2011-02-02 16:13:13 +0200 # base_revision_id: marko.makela@oracle.com-20110131075651-\ # 0394t3ppr6ao2es3 # # Begin bundle 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