# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110524111121-bk4tp0a3z0w47evv
# target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# testament_sha1: d79c200fa14dd49bc726366462b0d10c7f186506
# timestamp: 2011-05-24 14:11:30 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: horst.hunger@sun.com-20110524091634-\
#   c5vgswlrdygi7224
# 
# Begin bundle
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


