# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110228133907-raubexcbh32orgqq # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 85e87d6aed4b863e96f8e8dc0ed43eea5f343ce0 # timestamp: 2011-02-28 16:04:27 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110228090722-\ # 0hsg605yvm2ypl9c # # Begin bundle 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