# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110608132950-\ # era43ayduf555re8 # target_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\ # bug11753738/ # testament_sha1: f70ffa4d8bfabfd544c2cdcaac9288afd23479f4 # timestamp: 2011-06-08 20:30:06 +0700 # base_revision_id: luis.soares@oracle.com-20110519154626-\ # 4g8gpmg0ebg4jitd # # Begin bundle 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