# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110623125725-93rh2hi3ywnsm2mh
# target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# testament_sha1: 17f6818b38c4f0185be3ced0a1d7c98b9986e5c7
# timestamp: 2011-06-23 16:17:58 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: marko.makela@oracle.com-20110623094019-\
#   ed27kvpj7l27i0ru
# 
# Begin bundle
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
KEhefYnSAA==


