# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vvaintroub@mysql.com-20091118142238-n2c8e4ne5r27oduy
# target_branch: file:///H:/connector_net/trunk/
# testament_sha1: 2af4620ae5629ee6cb914913095c13e92fac2593
# timestamp: 2009-11-18 15:22:39 +0100
# source_branch: file:///H:/connector_net/6.1/
# base_revision_id: vvaintroub@mysql.com-20091112124326-\
#   xyrb2wdk7grmvjij
# 
# Begin bundle
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



