# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110315100102-y1cralra9lax6wye # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 7ac42249be6da212f3d6a1d7d292c86fe7011536 # timestamp: 2011-03-15 13:13:33 +0200 # base_revision_id: vasil.dimov@oracle.com-20110302085943-\ # 2ywlry42umdfhw5e # # Begin bundle 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