# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100524110439-fazi70rlmt07tzd9 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 4bc2c159e2fe60273a90407b4cede7853727ccd9 # timestamp: 2010-05-24 14:04:55 +0300 # base_revision_id: vasil.dimov@oracle.com-20100520133157-\ # 42uk5q3pp0vsinac # # Begin bundle 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