# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110523113931-\ # zrmt7h6aahna70w6 # target_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\ # bug11753738/ # testament_sha1: 1be43a561c53a1b924916ee3c3f717cc26bd4c17 # timestamp: 2011-05-23 18:39:47 +0700 # base_revision_id: luis.soares@oracle.com-20110519154626-\ # 4g8gpmg0ebg4jitd # # Begin bundle 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