# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110524200822-u3m8dgq33w15abfq # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # testament_sha1: 20d83c11e822b3e34f83109be1939487502e57ea # timestamp: 2011-05-24 23:08:28 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # base_revision_id: anitha.gopi@oracle.com-20110524162755-\ # 14y7s0hxzhftpmlj # # Begin bundle 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 FOFCQDTuyXw=