# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110418021716-8tyarlupm5xzq5tt # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: d1d55fe0b378e752bc8e06b4a80e87bc812e91d7 # timestamp: 2011-04-18 12:19:32 +1000 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20110417215351-\ # 3s6mfip2hf82lrlk # # Begin bundle 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 IQw=