# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110311130021-\ # 8pm72l82k47jb684 # target_branch: file:///Users/shulga/projects/mysql/mysql-5.5/ # testament_sha1: 2fd986193573fb1c69f49d901fb557dcfcc6bbfe # timestamp: 2011-03-11 19:02:50 +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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