# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100819103637-objk0u6uvc6vj4m5 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: de442226af66242f46d2169d5e77b735702e86ae # timestamp: 2010-08-19 13:50:17 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20100819041647-\ # wx9t9jtukdtb23jv # # Begin bundle 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