# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100421185359-8qaxoa2yyrpzwdd7 # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: fcd57fd1f15a4199c761c909ec64a96ceeb730e9 # timestamp: 2010-04-21 21:54:07 +0300 # base_revision_id: marko.makela@oracle.com-20100421102723-\ # 0i80uezbyu0ekj5d # # Begin bundle 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