# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110314055123-\ # 057o56q003eafe04 # target_branch: file:///Users/shulga/projects/mysql/mysql-5.5/ # testament_sha1: af9850c844df96797fbfc2726bed667ed5190881 # timestamp: 2011-03-14 11:53:07 +0600 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\ # bug58887/ # base_revision_id: marc.alff@oracle.com-20110310120228-\ # tzul0sqjz3cxj3n2 # # Begin bundle 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