# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110311090321-\ # lra05cu59skbdebp # target_branch: file:///Users/shulga/projects/mysql/mysql-5.5/ # testament_sha1: fe1fed1a6ab02589406e73879d0556209ae414b4 # timestamp: 2011-03-11 15:12:04 +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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 dQcyGIH4Zf/F3JFOFCQvHB2hAA==