# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110622082019-5b4yl9a9icszuz6c # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # testament_sha1: ba39265ffce9a55a10ea490f5cefc650a2cf7427 # timestamp: 2011-06-22 11:20:29 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # base_revision_id: inaam.rana@oracle.com-20110620043736-\ # x5pcaxuiulvqmyvm # # Begin bundle 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 AIsYBNqKjQAr25gs0mQD/F9v8XckU4UJDtV2uHA=