# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110615073019-hobymycvru129t9a
# target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# testament_sha1: 9c9ce3b7a8b80e8ac56d35c461b3887391a9440a
# timestamp: 2011-06-15 10:37:49 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: anitha.gopi@oracle.com-20110615030313-\
#   mm85qu4amqzx72uu
# 
# Begin bundle
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
symTWvIJHWeYu5IpwoSD7UbbKA==


