# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kevin.lewis@oracle.com-20101123210519-enudbyueeysw6e6a # target_branch: file:///Users/kevinlewis/Work/Mysql/Bug55222/mysql-\ # 5.5-innodb/ # testament_sha1: 58f68787f1f5d8aab77b3a799da59092a110cc69 # timestamp: 2010-11-23 15:05:32 -0600 # base_revision_id: vasil.dimov@oracle.com-20101119134518-\ # lk81dxudn9eaqddm # # Begin bundle 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 3JFOFCQgzFkOAA==