# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@oracle.com-20110520102732-\
#   bbamp8ocyswl5rcf
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\
#   bug11753738/
# testament_sha1: 3a9edb27911e019a2dfbc388dbb183c8db7c32b4
# timestamp: 2011-05-20 17:27:38 +0700
# base_revision_id: luis.soares@oracle.com-20110519154626-\
#   4g8gpmg0ebg4jitd
# 
# Begin bundle
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


