# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@oracle.com-20110609170317-\
#   u4v9mvdajfyr2y91
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\
#   bug11764334/
# testament_sha1: 8ed37d5f0d30ed7206b1c0af55870efe7faf04c9
# timestamp: 2011-06-10 00:25:37 +0700
# base_revision_id: marko.makela@oracle.com-20110609103115-\
#   rhfwxtmyedcp5il6
# 
# Begin bundle
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
/vU+D/i7kinChICQS0P4


