# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110524202208-u00luqvqwfqcod2g # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: 054016c71b8e575e12dea74f2ba8523cf45fda0b # timestamp: 2011-05-24 23:26:19 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: anitha.gopi@oracle.com-20110524162824-\ # fgm0rz95kjfv8429 # # Begin bundle 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 KWeB2lwOPr2P8GQ9Z/xdyRThQkJtdsvM