# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100630093847-7gkr1lh3bh2xksy0 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 77595e8fd599bcac19a4a1be34e15bbd6fcc4e6e # timestamp: 2010-06-30 12:41:51 +0300 # base_revision_id: marko.makela@oracle.com-20100629131219-\ # pjbkpk5rsqztmw27 # # Begin bundle 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 AYbh/F3JFOFCQaxu7NA=