# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100511105308-grp2t3prh3tqivw0 # target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/ # testament_sha1: 8c6ed5cead92bd28ade31e3b1a979c64ffa50ef1 # timestamp: 2010-05-11 13:53:19 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100511105012-\ # b2t7wvz6mu6bll74 # # Begin bundle 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 oiZVDGLQQOU1GyYidV/+LuSKcKEhzWOr7A==