# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110523105540-\ # tc09zrywz22v47ly # target_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\ # bug11753738/ # testament_sha1: b8e263e6d954be77a61ea60d7907513b3b06f48d # timestamp: 2011-05-23 17:55:49 +0700 # base_revision_id: luis.soares@oracle.com-20110519154626-\ # 4g8gpmg0ebg4jitd # # Begin bundle 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