# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vvaintroub@mysql.com-20090803224852-2utrc3bzpay72jhq
# target_branch: file:///H:/connector_net/6.1/
# testament_sha1: 1d2002b60353f69ff1b5e38a6f920ab50be4e6b2
# timestamp: 2009-08-04 00:48:53 +0200
# source_branch: file:///H:/connector_net/6.0/
# base_revision_id: reggie.burnett@sun.com-20090803171015-\
#   yhz88j1ntg2ni225
# 
# Begin bundle
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



