# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100601120933-r8fnhig5m5qnnohz # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 59592d695acf6f1fa76cd0990d94d04eca158db9 # timestamp: 2010-06-01 15:09:42 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100601120501-\ # rw667o3up7hh750p # # Begin bundle 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 dVOmN5l/wcSe9/F3JFOFCQKd6QIg