# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vvaintroub@mysql.com-20090803163740-aqgbxvr4ubvf4dne
# target_branch: file:///H:/connector_net/trunk/
# testament_sha1: 8ba45a3053dcbf0da464cfb4ff089e2d615be801
# timestamp: 2009-08-03 18:37:42 +0200
# source_branch: file:///H:/connector_net/6.1/
# base_revision_id: vvaintroub@mysql.com-20090730131614-\
#   i1tz3fkx2htgawnr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYkByK4AGdJ/iXz+RAB7f///
f+f//r////4ACIAA4CQe8pz2ANzu4fH1lKVVLXfe+7D09se99fevm6A0UpQFJLvvOu67fedq73de
Sm72b3gd2JdLY31YyPWXj21dH1nNtmmskIVS2fez157a7e2dG+jrfe7020dO6zfCSJFT81VP9U/J
N6mRPUxTajASNM9FNqPFGJphG1NDTACYR+qGEoEAQJpBJkwoxHkm1G0TRkAAAABoAaAJIEpomhBo
B6Rpo000YmgANDQDTIaABkANBJqIgoyjTI1J5oaE9U0zCQPUGgA0A0A00xAAAiUTQImjIGhTySfq
m2mgEeoMpj0JMT1NNMj0gBo0ABIkETExGgmTSYmBKMaJPJDeo1Gnqek3qgNP1QABoeoYOoGLCBGS
RIJBVUgqGQgREGScA7HxMgdfk8lijdV14srs1082tJtTfn2UVBVBFJFknxfu+VQP1ibm3GnWQm8A
G6BcQZFc4KUjINIgHXBBbQNEkyMCBlFhLSQLYBLQhTPcQgaOGSaIQMsJSEO4gWhJxmWyVVCKkK8n
9Fo3h7zw/szvW/S/UUAS6qpOYzcsOqJlQQygOouyavOa0rDUWruusDytpWsqCxSjRN6rptehX2nA
11XO1ZJVzpFXYRCS/X401/GzspODel0iWKZO7zY8tZC3NjRVV0oU+e6LUxwouKrCzegpBQIsLlsm
C9zTKVi7PkPi2NVx8OdrDIzq8PKcmaGIeW75HGt2sAUhwZKf2THbgZ/r/JA7fy1x7mKvtuc67SBw
4wVRVYKSLGQZ2qpErtDLRuDCqQJV7Vd4qy6u1aC6IVcEWCglmMw/yFSgGCk5aKMhqiwEZA1mxRtY
FAwwFVz3RYtc9G++bLu7GFMoQqqc21CjHvZwzE5RixuTRUwIoghs0fe2q4uoML8bP3tA/JkSgUPh
AY2LChoGxZBTe+xeKqOiIK/ff6C7Tqx05/mNQaEVRxioimYooGZV6zL+MwcngCv4du3VTD+c4ksM
+8ocsgxlgtAu+WNOHYQTVjOh8yMzP3tBahBtgtIExVWEFkWKqwFVYKT8M4J0HDwCwf1QE9XH0Pd9
2NtCZSXEW+4LOI96g3jFTKgzsZV6O48DI6xScn9UlVsMhIU0dh64qA9Z0u7LGp7CNeSiqkluYq4S
UV5vYVc1w7sTG0mR2DQ7GFrVmdos96R4zEUBrMmJu47i1Zy3JvEOtcZkoZc4ZWlMbqBNycpVlS6+
VeJoh+SOTES3SINIcNpUV3dU66D8yqgnSztRQsJzskrCWerKdBXJiqDV+/5H9phl7/+uQz27BGJU
uo4Dbqkv/MjyqUPQdEjrVFJQMJhg9IobUeLThwtsRMdRYiBvYiQ4plCXUqm1Hu0stZvd11iHp85x
5mBibRZpWI58L+JQ1JmvGEHBuKofjG4qL5kuFwFRh0T0+m+bYJ2BmUQlkNDx/Jg/ocjTGCxVnG33
1NfrsS8NPXuTV2+V9kyitLangTlWq0DnJBDcMwKLkftvEYHwhBc11KnbGlc/IPi5tMeLFO/NT4J/
HcqePuyT10ft8RV5Aok9r+xYZRTkWnq635uhjEpUOZnd00loLJ7rGRHPAMLkxjZyuSUZ2xJSL48/
s0oTN1spbJKKx2qP8J2TgjJs3oFJbnxT48FbIHerAKV4oj7GBnsQpw4UnPtZjaB7t1Lj3Orcr2XE
+tS58FNTBajqIZnsQsYZA63FNummm9JiYGECL9hqob62HKoLKhNsqyjlAU2KCQCngzhj5ZdJdzcY
7wQba6JLWs88uvbTOgtk8ZFKTsGUL+JQkOhQ8XAg5I0RE3UxrgnKHux4NDyGxxmYUO5mC82w+ZEL
qvjaHCWHXbwNpaGVcDQSXChezI1GhAtx0wcKU5GDXihRbiovJcYg7Eux0sF4tXx+tWFqy1Pas7pM
4WsuSxNaGBh3NuxO6qWmVlUYJNFLEiguYObIbY0zUeEX3FSV2o7iJ0LoGSL5yYA83mgItZGgRnS+
X9tx8HKcfHy8nInNmamRZS53xioNQNCr1De9h3sgjVJJPst9j/Nkfbnss26u6+VUP0K6/FzequsC
TPDswX6PHoPw9dXJSoKUwFCkjAT1N4XoJyBQNJCG0UIctwhBREdIAM3alGcRuPT7cvERuP7mmjnn
lVYhx3pdIGpnHtaWkl5cgixUs0tAoU3SGAg27PhA6QZpsTF9tQxwVFszVjcXOtSgzgs0SA5GEzur
SVHUnRjd7qquFhdaw4KiwNZ/D3Qe43eN0itG2BVHFTVR3SLtAsIaF9HtoN996EqaE82qyrYrMoTZ
7+ukpeK8+tE+cl7zeANlsvfObsLZR2abbTiSwurnY7KZyZfgqx7S9Kw4yoy7PEh7YIE6zUi1mcbZ
YzscSCK4rGpVhoNip+PY529vwfSN9SZ2JoGP4xjUg7qd0X6nzBswJVVOGqobBrJzRn0KyJgLnxUO
X5k+zEoaDy486r3nQuIm8EEC7kUTQokMjdEC7oUSIUUS5dhpgXZvo/83PqZMkHTLqKZlKmsrSe4J
D9qgF1V0SJEFLVTwIAljZBQsRVwYXccE8lvK4ktJaduboWpWoRAuJAGdWVFNFLUW00tqw3qKIFr4
6IHhakKXogUJYQBGFWcBENdZOw0M8oTs8KqcpiDJ8gw2QuogQZYDAGx6/ZE/4ccM1Rn4LLFBELQF
MJ+2hkYyIPPCa4g1ueQyCZkNX0nSUxPtcW22mG2kO6gbL/lPWImH2WSmGWGzAyhLqgpgHrdWGiDn
BhcOUp1wxurmW/biIGaiVvrnk5Og8BUrcqMiY75wCkErHoKEzAzVwIgYKoGCrSQMFiti8MSk0EL5
kZgjCyo0w6iAFtL8JcMsMDtGrDUaGiQjG8mTKGs9EFNassx+JnRFWkDG2qttYl22UtTmWWYxnbW4
xlBYXNpluqR+VT46DJOQ3HUZIWGGTdbC1rh9BQYWimgN888isBVVVFBVVRTmO901w5Nunfm7l93f
sntgfaOdOwchItuqatAKfhYvAqdQToAQwqakrE4GKzqVklEEBZQ3BwXMh2bE0spwTI9UCZFT0cG7
hUUhZAG22wM1TYg7jtGGNDc4Jmhyfm5HJogh3HUmgTTg5JXtCJizDTGBhTL07i843adb9eMENLxa
Exc1FbSyd4IIpCBuXIeNCO9R+TZrMbumRZjEDmB2S8IygszZnXAvIvRSqAgqrSuzuLqpgcoOwuRc
VgfZIQ9ZkajhwpZsQTvJRKdpcVOJmIJoX+KBIMmpM2OSDvGPiQENyxckbkyyOSMlzQc7z3U/58o/
Jz02vtELdWVtnnhmjKSosusqb1GseAmEx5FBQVbWBhxQYQCvcTkexmkAshsTXvrYxKFp9ZNBQt6i
C+5YlpW4QDGOQzManwKDEDFzxDHdcVzoZMEjtT1HaIe+eA9XZrzwcnD7eCAWF32nvK93h2nexwiC
DIA0pXEAeYtUB2/daAULSKYPUPkcQic6Ks+I2eBqOomUG9lw55pFpUk9N8DkUPMiCETJb0RBDBCA
hsLldjuOQC5YOox1PF5GNzQodhsbjCAckzBwTOhyPaIDgcR3741a5vfrlo7LXFCelhnWEGZwnpng
WwxroUqTPfQTkkKXplVMnUkPtoGVHuZLccGnGpAuuhJ+pBng4LltSu2o3aXHNi4tCRt2zOpQU0FN
zgM3NipmslWNrGvM8cUcUWNpdL4us+pcuLBxa3BrhMQfVQK6TKm5jkuIBIY6ClYeBTr1LGSaUmp1
uMw45I6mxUpyMKgHCIIMcnU4HNDggYdEENTgcwXKFTcitt6wkauYWTLvhtpOKbnGpE6ET6VyITUL
yFEA5JCMShMmyRsKToMg+BmWXkJCINtBNEAuclDBc6B4UCgcnhOfKgcbqqmC2NmfM9hTV2RBDq2h
yIgbDFZZ6WhqwXQFDB2kJE9Cq3yuKx6cSlIK7jEwMTIvMEJGEVLCDYZqhoQW0ogRttGziai1IRYV
GYm0uLjHEkaFj16cb17L6bxwmSk9kEQgEEvZetjdEEHprL1uzGpHQmVK5uOTvZye6PSdTQwUIUzy
UMnYVMihIuNxBkaFgzUQkI0NpmYbxhsGZtBqqgNxArYA3RC1CyiVR0W8weMhUh+OOcDNl1LVw5kq
iGHolzrsUUFmSLRpX5GZZ7LG9bIWXSl+ajBl1NKDDdYTIkrJKgZ2KhNLpdGUwXoZNfa139+qPyGx
xe9XHk7bmbYLTgjvutNf1l9YYvrIQEAz9UQNLzP1/pkfliDNw58dU1GgRKBkkRkJwCT05nUoMe5V
VRKSRA8dGgRkhZ3lYYAbTr+EXs20K41LpKCGOCMDD2ue9ARykCOagF5zcJPGa2zuHqLNX/B9Rh06
iX7WUJ+U+lPWXF50yAxCQISP+symWjZzPw6C/7J0W0/by1GsKlRjYMYy1e+CDXYMQM2aUUMpTtzC
hyNgxrGVThTpxhxNj8NuDTOgFRr+KPYYnK72axtWY6hfn0Zdl5/Gaprf8I7huaJ8jzz+HCuiB3Dq
X1YoPL4odRflSTzQusKww7mtSdwPtBjBxuSEoQCHZiiTiYEQsPsgDDOZID2sXYXnQeo1lO8JRz0L
DkfLu+8nYIsc36PpKDKStIoIiVjFqgsUNa9xOaqq85o6mVVpLA6gvgX9LDszAzoWIKBMsZ2sxSEW
UIIoy8E5iZgzO6agoYb8MkjKVS6oaAn3ROPxFrKvrxE6yDIYaMmUSTJeFItCAx0jQxZ0E3zkGoYs
HoOcKYHJO05w4bGe3jrtNZW8uMsUaHQwqFfCmsUGKoLvtpgXF5M2DPN6eBULT6ciMDI+akydEeDg
6PDnhATAxsi8BbabZgLjpxMSu6VXynr2HJDEPUJSIygnL8h5S7DErLhGFZkgqkBU3+YkKbEDmPuB
RxuhsH+x2Hrsnx8mu0wddc68LurprHb3lumLqCpIaaVBRqhEVSmKvHozGUokSkyjoyEaiwU0VISX
I9eXToPn3s8SXmSCis1H6PwXNfMpgZoM9o2D7JTFy5b99rIIHENtVX46qIiMRoTGmu4aKCTTTXIa
DESVW6FJSYyIi8tsObBdaauyTBl9zPMLzaL6dDeXHkPnEfezNh5+hrCT168SSbmSJEBJHuqWA7AZ
8dBnpNpXhtHO5etAW12WfXe/C9JEYBkNIwJHfYITh23L1RU3wPRRAY3AHH9ZQA7xrmwYjpFw5qnI
KGLF4dIR4hijYMfCbVjxk5l/dyR+xUOHVOmVj2Ncsl4kl0GJFBUYBhjdVRSiIg8hvXGwd/yIBdoU
3ixTERaF9A90PaTlJgXBXDVlDvrcaYjwoOkIQIKDCQOsyEEIJIlfg4b9o7/zYBQzTjMxEEgjDaH6
RsBzzZ9tSOgv2CA9NhrA/c/dFamGawSoIDdkUKAEJFKpcQAwCJzBnxEC9yt3IGgDVcLXDKiuDAJl
pmQyBrihUwJbVt+PXu/EdDdBL1JfLePQmFCw93u09S6c/MwGMwLjUWkyZcdZ8xYFpIqepmgFkHT+
NfZnsD4Jto+D+5xEEOGjYcDqSEZJCN5uPoNCDaakqpCPqNRDm1zSXBv5EhJugC5JH42SQY3pMdIM
lMzuzssdKGY2ED2xAq3BD1AIWUXo1WbeVJTkNxSvadZQIKHEZyO0mdCwqaEjobu6DUdZaFhidZkk
IuMhpCNoYYYmCQi0ZpoV04hzB3nYZBwILNeB1nPQO1m3wSAg2bjWTLLPeTLUWDUBbx43svMziPT3
VHOAGe0q4EwLppUt90GxDb8zSWXqQGqbhxc1aoRNIkrzUXIylPysNrERkF6BDGLfmr0CbDG1YXXQ
/vnVd2zcbr6RU4yQYeqJmCVKoEUSqzdDMVQvbEMc0miGm6iiTQz1SEelfE8ztPQ9p2noWEywkQUO
zxkeRigKnmGtATC4vK6z0PekQ0Ojnid2AFE1lwpkAoQCoUogCWhxGZ0mu4LKJ18CiZ9DFAj3DUc+
O5zEoWCQRJMJTBm8zI+kAuKoKn9UVJBVAdQgIDu8V4KiqDsepBEIkSs0lEzP0PJHuPpIIIOP691j
JeVbTdKg5UcoZQtBQeYzWE6soMqQrxtjNJJwN6sUsTQhqaHqosmCk9Zv9HBUwTQNCDelkywKYRHR
TWyoEwCWw3SBCcxjl0NxIrMMmJWtxl0bb3z4QZrl2yaPdGzJV+cnNBtMPfZEEMGmZhbSxLVERkRP
MeYPIXYnaTOhU9SZCQjwo1DsZPUc5GwuOoKnqTOw7Ly0MiZuNq5uOqDnCBs2KUNz+CDgxQI5jEcj
ecbd0JLgrxzJFBzsSVEHIVSUa7IiIqBUViqwYsFlRKTEgVBIewVJOQgfimEDcSRBVWCiozxsJAMj
XoeJ0BmYzoTChyMTH87A170CqP8inrHoOtMiN+kKmo3SXfP0CkTHeOE00SRgmpCshNCbCIIIbbmZ
Ey4KF0hYmw7zShmqAvGzsMbhzpLAcZEsBMiHCGpimSSiWkjnTDI7pOr+fNj60W008MfuFoiozaLp
fmGbQDUKEggQQMASdGOceObW8UViiQMCgdNeaEzQkUUT2dO+YEjzw6CagcibagfqNQgUmUrAYR5S
7/UnTOzMWzRkjCnkkGhYdagmEtXWF0bi9inVZIhAkIjBDVzfLQCgVU0Opc9KF7eZCB4OMOd5dFLK
lyIbCDTZcTxGoqrU3Yq0z1ZcJBAjPXShT25VScV/aX8HtHkPZPSU3POec+AmUPQOWNCZI8ogHtki
hYoUFJJCILT5xn0FSvy4ikWnAqazMNYy4yMQBsVN4yMzfAOpU41dR+tXzq/bUPdhO2UpADT2gmGa
gkkNoySU0ldmMRBM+HjkWgLkQC34n2CBmqbgl0RwAzJWBcaBxP+MD2vDyxJFgx4iIqNEpBgCNABD
q9WihLjvpS8IRF8jBNlj8/hbFr6tawIMilWwYVLkM2gD5H2nlRGvqes6UPoMTYacqD4EMoSCp2eH
4htx9gYHKqY/YgF4IYiQQjDY1zQzssYbNHZ9p4bjDDy61iPyMROrZRiIakOINPueJPkPCchFfprK
KwJCAvuHnTwRYbHZyIDJEgiERFIIxEIxUSMAYIjAFFIAgJBO2Hh7KlHAxMjzj1OC6qombfzCDXl6
TEa96D+c35yFxAb7SEVLrgWtCxXKA2NHx2lPZVupR1jwkL2Erq8Yg9nDcah4SCSKPkgLSCSBACJE
GB2fnPYZB7vSVA6ZvDyMgyKCKK0bTKdZpGoSIkxMFkLUd40LkCYkdwewZvDiYnNeOtH3SiPwIc4W
MVd3lHLEx70YakEqvcPAVKyGzHCmAPfEPfuMtTe4KaaDChRuMpGNnVRdh3hn04BLjAI6KvNJKvLW
EKRkYe0eH7R3gzd/Oi6U44RgdBFfirQkjFbEBKJFcDQF5i2ou7igtqh9mZmJUKFxgIYkyH+c/F9x
rS7/OILB4JGbB8kNBvLeulXzzdhgXAHlHW24CHNlehSA4yQNEgIBEAwICrCDAYEtKSLJ2s9YQwMh
U5AM8FiKgiwggDIjBLz3pjjJcKoWPq8FazrcGs0eY3ATNSKXDcJHMG/8gBYqZFFhA1BVxbvl/ggT
SHn0oya1A1mK3xIUEciFUlIDVRKCxLMYglDZjGCxIYQVYRuooDznpNsC+2ikzrSyBqk2MMKzLkKh
YImEtLDJb4g7XoQh7p9+HnDXclTkwXTD9CFILYQq94qkNYfdHAw1F6sE6zKIHzhFa6xG7U0MBovu
RAIxyBtL6EZAgkCKQIMyooXoctMYDoBS9VwKbDILm1ngal5FzzG+tLqqSItKAUGF1VvWAYisZAjI
FmoGDEXm9XdJO8V2H1/fBnK53+o7sYRyXi9vrInwoYeOxkq8ueZCEC8nkkh7tEr3O/CKIMUyXZAn
EERFBCSIQkIQeF1RFIyDBHdIiGuA2B9c2C6JQcYSSBEYVbIV1q+86i2aHQc8LCyAbm06cj6U9AzR
mHWWQOaOJ+/rhXa1rMhpWWjGNgPYgMxX07zZ8SakF6Osrti949hQQd7I4o8IUB5kQ5h08kOkVMCK
qc52h2zmC5ICG4qGyIEYz5vZV6uAL0GXWghiJh4Q0BBJM+lAQMJSAXxLh2BYDRRKCJoy7jZQQkQM
R6SED3t4aKCOqxeCfM+doOodmwlTJeQXegiVwEGHP3ZCSahQ6kL8RA40B0oDAH3y4L8YUkIyJpRT
RUqK7VJAKwVIM9JAKsQ/BiWQKr2BgEImi3OdV5xEfLRRMAyhcSFCFCTMCIPqI2Hsa8SFCKLzQQax
AB71BxKDvUIawZM9wfQfb3B07N4rhAX6qgzIGM/uUL8GUjmZutAgMmEMFFXJBJVsoNklZcLDhBBv
q7gI2HkxOEKpHy/OdARWEhISEhJsHoX1iuRkXQhheCGxDR9mFoLV2rZINixDG0m2YiDQUMAHSaB0
Ah3WlGu4QJKLAKJRVLRqesEITvSwoDOZbFKIMDhEe3bo2WRd6zY7W8vxki0YFqavlKywmQUipUhK
hmm0BdM37UrQoIDAIUhLXLfPIS9jUNjGnziguCOm9y2bF1MYto9sqz3kShDBdiilL0TBmMEZoGLI
AKoJKgwZmK0INWyPqmlLyHY/FLXEKD0STSJVtFaAdYBMwIFoZkvE4S1oiaBwV0q1heYd4voBoH6W
QcBd6AW0JpHtSdjvuhFt21wvfwvEGpEwqyvyCQvPKm8QfPC9wy14StkDCOwkZilBU/Vlmp8YAMfc
MGprFbg36LehWoC6A8UyGdDRKRnUyeMS4gMQvMlCHgegZY6oO4lrsOLIZlkye8MDqXFSU6OBar0G
sxxMyANZC9N2mXMsDUZQxEOXShLUu6ykrQUmKoljW45NDCVYSigs0+yZIHs6cC5vqKyimkhS0jUn
AsKoLnHTEhypocFIm44K4CuQg2NeBfczsCBEkYa/BiQhwDroOBYVLJUCkjtQHLZkSXECQVxaXFCH
FDQRSYgPweXYM3SmckhAN8SkToYVQM84IWalBAhlJnTdk1f7wo/qhULJ0TcbzhSp3BhIbIXb4yJU
yZJCkNQxFvUbMB+uDOq5iy2Qpj36LupWatALYLRZdisloURulSrVXdvyR3lq84EkSKRSEdkgVmxN
w92YmfaNrliRSIwUFgCqQUBGArGDEUWQGMjCMNEgUfsn/oxteKQj+HcGgTwWvZpeuhQ3xiUKwgJU
7hBA6RIlrEz/S8IfWQQdvGMBHiP0EA5vRydqXVCCrBiIHyeAJ76RGImxrPgdxaGsCds0AHoL/s7/
LneJRo5hxO8qlAbFyQ1lVE6aSQVwWpgBsHn73oAsfhBU4DaUVhFCM9MCkRAqZkMilCtmJ7pvct3a
QfmR7qAUgzYluMkPuCqP5dJbq7k6gZpnSUKawQxKcHAIFrChcqcxeH0QQyPMIH9/Ip70OwogRXJQ
M5BCMNSESg74i46IBsA0iVCF3JgQpqYVmWjN7XvGFvTA5dCeGeIKPmIgiAiKKLIRBk1BCTSA4iA4
gehBwkGLZtIJ1g5JsfvL6K+wBCBcaDf5k6jYfOZbj0oDZW98S7o/Jg4IZ6ADe9PpDp75QooPcVDn
R8BviFrxmdXTUkhhkuGgowWMRiiEGYCXijdN0vn/F3JFOFCQiQHIrg==



