# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110202135801-z3c3wcszrh5l566h # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 1da2e4c51aa123f62c40594dd58ac85852ca6412 # timestamp: 2011-02-02 15:59:32 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110201162841-\ # ja3in4hf7oakc9jl # # Begin bundle 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 wRPtKKh8OpLof/icqfJP8i7kinChIMz2IPI=