# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110524084131-jtm2pofyd0g75nt3
# target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# testament_sha1: 841d57c79c917790c38b2d3b1b4d6095437ba2ce
# timestamp: 2011-05-24 11:41:37 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: luis.soares@oracle.com-20110523233355-\
#   cubjr2teo7mwqgvs
# 
# Begin bundle
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
L5iA


