# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100512130448-ly4b1h9c0doefg9c # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 6212dc69986aa616f0f3951855d4f917af0e83ef # timestamp: 2010-05-12 16:04:57 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100512104603-\ # vfwkgy2fgjqtohiv # # Begin bundle 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 vF3JFOFCQ0KAkDA=