# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110615073302-q9kt3q24z0ebkp0u # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: 3f26a2ec3b430678fbab866f9e55f8c7b11af123 # timestamp: 2011-06-15 10:34:28 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: anitha.gopi@oracle.com-20110615030610-\ # 1xlf39g3a35ve1mf # # Begin bundle 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 2OTsF/CqXev8XckU4UJAzzvKNA==