# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110311104113-\ # mfyjbxo3cy66zb27 # target_branch: file:///Users/shulga/projects/mysql/mysql-5.5/ # testament_sha1: 73e8a60945f3f431c7ce9624d5f788fc46abad52 # timestamp: 2011-03-11 16:43:27 +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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 +VMqbw7Bik8Vf/F3JFOFCQGzZJbA