# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20101110085926-\ # 27ctsdam7hiqmjn3 # target_branch: file:///Users/shulga/projects/mysql/mysql-trunk-\ # bugfixing/ # testament_sha1: 4eb75241b4540ad1c991a5d43d05948256915853 # timestamp: 2010-11-10 15:00:19 +0600 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\ # bugteam/ # base_revision_id: dmitry.shulga@oracle.com-20101110060211-\ # dy1uac9y802b9i5j # # Begin bundle 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