# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110609105902-ppbvd6s2eyavdk2g # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # testament_sha1: 61ffcc64cd858718be2517c7b1720b5f89bbafea # timestamp: 2011-06-09 14:04:40 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # base_revision_id: dmitry.shulga@oracle.com-20110608134450-\ # 1d0opabpgzp36za6 # # Begin bundle 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 KRBTUsiB/waD3H/i7kinChIcV9vOYA==