# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110304014748-zlwaz2em9syw5iw6 # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: ce8f3495a8d5a9624f151f8f3076f5ca542818dc # timestamp: 2011-03-04 12:49:17 +1100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20110302230909-\ # ec1hurrlyvxf8j17 # # Begin bundle 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