# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20090531005632-wchi6jjudzwqlhe4
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b43263\
#   /5.1-bugteam/
# testament_sha1: 512358f2195479dff3544b5604a1572469839157
# timestamp: 2009-05-31 08:56:48 +0800
# source_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b43263\
#   /5.0-bugteam/
# base_revision_id: zhenxing.he@sun.com-20090530135409-\
#   kmpnwme4ao9srac5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQWdCwsAJ6TfgGAwWXP//3/v
/tD////wYCL+A97Y7d1DAjwToo3PdnyK+3Otu67K65KOhTRpBmpr7O1dw42A3YDHYZhlpge2wpuz
gAAAfWlAAACgoAXsZAAHQ0TQU9KejUPKek/QiYgB+qAAAAyNBkDTQjNSqeSGQAAAAAAAAAANNNAk
SnpqAxBqPImjQAaAAAAAJT0oBITRDUyj1MTU9QAAAAAADQIVJARkaT0TE0ZKeSfpqT9U8pk2Kep7
UjTQeoabIgVKIAQAIAACESYkBmo9CDQDJxCiD+iip4CSAf7BfyBcAm8NhKUkUK1VLNBUBFMkSESN
KSUlDS0iyKU1BUlA0KRKQCryklKLRQ4QCEAgVyUFgcFMVU1MUQRUxEEic8AHPFAPP0YMpeHVh6bG
MLlljNnwnVKZ4RNcquiATRBngxIAAy2RFnCXLYKA/ONIgAXxnrrqoZEJIchgzAbNt4xMvjzO8VOo
a0qff3WYkN6Sw9yDEFFJQUEVFM1OMYaxZIVmyVERBaVQVRW0gqRKisFWmoMYjZWxaK2YrTIRgkag
gwkaVVVVFWSKKSSLIKChhSlGQBmAZkRmCBmRAvmXM/Ljzoyif+9smfHltpq5KTj+nzz27cp5rnjo
CyqbBhTGME/Vb+HP5tHl4TgHTxNFRUKxXoOtgGDMwnXUx0+IF2fq4DeAgtWxE0mU73XtBwKc5yD1
vGsjnUHD1JbbydsvaEFj6094cl6olnUQodPOaCRLiahYxaZtJMhZpbqqTMshu8uqRZLXvcbLei+Z
IQ1iU4l5MyVp0NWcc3YNtKUpS0ApVS14WxyZhwzrHJyypoZW2spLS47tUFFKta+r6s5o/cfRUppF
RpaGkpBMBjhxpgyHJtJ2Y2bDUp8JYIS0KSGAiVoS84YFNBAAZjIUzURyAuHjJ1GhU0w6SA/gAvVj
0Av8hNAneI9iDzINEFAMQUoFDQNARI0xA0FCEwtKgUUFI0JSK+nqADn58/Bu3mWRu5stBlgys2fk
3i84UAB+jV8Qjt+jXTdOxJHj2canZuxxaFnjtulhu4SxiC6RvbF6lMahJZM5hZkxnXYybGsOXNoc
eryrNL1yAvTx5hxRxm5lG7eiIS1rFlg4IsEZQelWs6yxMS8kWbKLVM5KnDEh4eaUCyjFOKItOxBx
phdiwsE0ogRiwpM6GJyDGA4MvKozCVUU8SZmSUTdpEpJEpJJJJJJIlJJJKRWTjE2FiTeDUXduHVa
DNqJyG0QTRjQvbqQcTPIdQlPJZFFL5M2ul74tWzk2m00NLSrxNDve9XIalnQ0pvZjV9sljMudJZO
pqr0/hHpG4GoeiEc3cPm5hoYEGDptIKW6gwgZeyaHTl7ptepp663aNngkY3zzrO9ttOu53IXMpoz
Ol6idQ1J02M4tYx22vL2MGXDvBCMRvC+ZpMKlzc0VjyCKMlKXuFbzmongMFii5Dk49HR0CZY7cot
k6emOnFr21lJW7yMY8cPGo6d7YdBeVdu7dOnq/Tm8cphw9PHjpu3biXbOhLu3Dxqzho22bPEdMw8
eNWYNmTkFGSyKKKKKKKKLIuWcooooo67Xa70B2B2aA6AX7gzB9on5J8Q6Q58lO6F6PKC9/z8x7JH
TI7pB0yD+cbA9eAR6ubn6sQuqra06ka2sKUxLHsZU9uLeY8RlwOjrOuphvudGm3spXwWUFaDv/6z
Uii92N5P/pe3vQV933/X4/jDDjHu/V6+LydONeVt0Y6/UCmNXoyRF9ogIfY1UzFVM0VSggPuAX8O
rB8SBd3MvBBUPJRR0f2ovR1Nq91dinfkocmbxfhUtVWKvEq3KrFi5c83CxT+SkwUWKSQa3k20e5y
PN4tgHjMwacxGWjymgQOSCgqhClCmkRqqoGigShV4YpKRGJoESreIa+fDgNhreDI4SOw2O08RqZq
GuEq/0uiqRbBiptVbGaxImi6xwxq95uO1EQdXJwZO9IpCJRfrBXQ8fOT2BoDj2ARI5hwEN3oo84h
7jITo5vSnNW0ghcuXShJ/YjxIdb+kUkjb5Zwm9IhOUx7n0+ePs+eM1mrfS0haeCgreRsWKuhVEap
TCGWqpGq41WWtIBnNvri2b3tgM1QRorPBSGmDGDCJmkzQ6JTKUzwlFFE3KiVhqqLtXTSVRlojWxK
0hhA1RGFJhRFq/LPctxX2pEJXOqRCZ+MRAcxg0MCQowxAI9pt05bYLJjLKJGCBwbgdBpBFuPXGBx
VUk5CotxGAQhDWOrmi26saOFjEIGVq50TRo5wsWIarYnfBDQDgkGtwYAkiYT5s6dJrFAhTaAAgua
MWEiSxJbapgwUYJEuWL1yxWq6/Qkq2zZSaLEIUnqWO5g0bhVRLjXWzh4MFgzKna0tbtuq0dEqDRn
JYwbPuLncQ7PFa15MayuaQUYGym7JqbaTBcwamtuaIreexgydHgh4LkIXOAlzB6l4tjh6lj8Mn3m
k1G0jp/V5e1BHwVAGSCCoM+vec3Y+YARWj3p9mrYuiWqmRQqgD47+zWMX09OKthb3ngm9UJiZq8m
LEIWDDxRnIahGRYQNQ8FCwShQoGMoKIsQoua6AH1234DwSKo0YOEMn0SuhDHoGey2v3wX7lUVA4N
bPT1blwroawIXLEDAnECon2ZlAiaY4AgqEDYFgQRp4DjjKaRF+/90DjsOkQ0CibE/RXzhWhD2Ery
d4cRTFiHuNdV6FVYSwY+FQPAh5Q8oGC0IZ323Ne3tjq/1v311q35fyWw+eXxzJ8jzTpsT0ueT19q
LZHR7pfXxJBwSXrVpaoSy/Y2TO+MqNK8a033s5fHFEowung+B+kdjZ43oTyjPHTPJijWoXfXZawJ
3NnfzkxktD0O5+OzJRgQPkYlU3dx69DBZOx4IGzhtsRh5jpHf0+Fe2Twh6eT1zcw79YvYPHj0PNY
NeuuF9NKJ6nCWX3POqo8lFcEudyqjNrVXNSxVnOTBc9oTl/u3F7jrb1G1jJVHRk0J2zgD92vuo5p
4w6H40eU8lPw1K9mtvgaCjAxKoqMSg3CFVJ765rrmax1JnYoqFWRjqXVbCb0myBa0pajkQEjFYTO
lRzCGiqKmeqNdMDHS3+6igDGKX4/PdeDRg+ei1dxKrhc0VY57w0bGuvJ5N3xQnnuD5IYPJkOi1WP
G6sXMFtJEvIfYMoE8maBiwUaLoMV+vJSxa7WmixbkzXuRPiX4FKTAQPBuFzr4NrLi/qXP4T8m8++
zJqDDELFqRPU+AaPLiyfH2gSXOGDeTzIuBsJYuszL3g91v9FM8slE5yjuuq1qPdfWlN7UwbXRyVz
3VYrFKUs4bGiy1eu2Xt6sw4Nbn283RqmCh25c2zcvaYYUWtOS1mtuk171FjVVauapoSXzU/kyeGp
Y751LjjOGSnBYv5Krjmoq6bFjY1L2ptMXBtYOt4rdy0n5+nJ3LZ7vEXE0nDbueIcojwh4eY6EGlU
ECQyLMKIuhc7uLkc7qtG0ul7zFtepERVG7lnzQzVYMFTDo3lQu8pbsdujQlq6MpclffY7ZoyFj7f
BYOCQRCDsKTWWJZIMwZwLRbhtwjvCgKCQxojoHML0XVRXRVFQ6PHc+gmRq/zz5QuGPzHmtH5jyGT
unnjNQtUpMH29GTwat50eOlts85qHhJXao3L1WqlNjQ0ti1qq2LnSe72YsMMa51ztVpY4QRLGC3o
JmQ00fM+RYzc1CG9QLbdFgqgG1kS6WsA4maFIUHIobl6FDeCHEF69k3u1rZOLyWc3y/m7Wta5Ns8
326PR4Ob03PR3zc1v2qwdrseKrX0f2udX0uWHevo7au95SykA9LjgmagnDzPKY9RwR5Bsqea8Vq6
tVk7Wg5EPNTSp6M5rNworlbGAbdvfQNo2QRtlgG2wBtLE0BJBYjy9fM0hg3IcuAmVrh2qptxDbPy
5aSS6Q96F787+AuiPJIztGeKJGwRug7g3oJatlQE0DIOTlCexgxp89pJswUeTtA0djB8TosfcY9v
K4NF7fu5vl03aK1q34fVjHa3KPdva27PbXJZZxu9NPhz5dtWii/Jgvb99Y60To2LFXatnqzFrm9d
b6xb9ylVXU9FjVwxVZrG1RnteDSds2L9yx8O1/F1MO90YNbH4XryabHnsrd7WeTnqrZ58a+Vi1At
bK970M7+ROCagbKWci7i6URWwFCniEkLlJ3zBEUs0vH1cePnAZcBsxHzcOI5AddBkIBgKhyCEjtI
Tz2KFPzcoaEoy+2Az7WHgADrI7KFdL3Nlu9UcMu70uYXE0FxPiWNVs7DgzxVisYRsokTY3YrEno3
LmGlLFdkx0mplhTCtdSllubFg0YOa/EqxaPFubHi73mNeihc0ereqkS1dubl65vXtbCu7borWxe1
LG1VVua9m9ayZHO5e1UZLlHBYxb2i9sa25o2PnBPVk8Gi9yWm5lwU1a1NsvZNj8urtyYuSjB7kyb
NrW/ixyfbctdzpmq1MN1GC4XLcnrqcXN8vw+H6XMnBV1lOyy+3vb6L6Sq/VuqtilCp8d3HcuKjFL
nuqXdBbrEygZOn0XyoGW9aEKVVVFBKMYmhW+3Xw00EI0x0Xc6cnYBQbIKq/1Y6qUlxnpe7/NR4Va
NMcVKvRVLVkqZrrNdK1tXJE9Lnm31U1t6zPBTK5T05L3eu6m5b651XPtYxWqubazet25St7JYo6l
zJzea/pfwrWuJa66sli2w3tHN3MH0x7KU6604qtHJqeyq1a1NSmltFa1we65VY9LXf0yZyJXo5lW
5k5trFtYMVy9iosc/Da5urJ1Ozo+X0/T1SJ8PlRubmbD8LV7rflmO9g+Hq1Pka3B7Pt7+O7SHT5B
1P5mLbO4JUdao0/m1EXUyoejBFR1sg5eKeo3mJeHeyUrqN5YONDYEuNqTvAG5YNXYOzs3k5dmOIS
EboSxgSvLwk0DRKHnoch6wgd8e/d9XS2tOxf+y3f85zml8dLaBDxDwb7K9z5lyri0erZrXX5La2U
drscm5TddXFWyYOmTYv29dKeTeydVjmwXN9aaq05bmttezJnIm/BrbDc71G9Yvam18rXUNzReydr
JWjBg1tbgtWKstrYsXsn4cnwTJa4vkYvi96uD14L2xV9WDYegYOgDwixjOtjjqHeCAnHikjuhdOZ
cCZbLrwat6V651SgEjEsCGOEoiqjNXqpyLedGrQzKxoRLnyMV0Ifa0XE/Kepghs7emdMlQtSbYd+
wWvC4n4Otnk89OOF+h5kuWOvx16Gz6mNFiZ/Dx8O/VvRhOEPAn1GrGe2yRzg7JhJ2waPQwfAQ2J0
eTuJ4itwwIZSdxqMlGttaMVi5hS2lbFl7V3M1jko4VYN++440LN1S9hTVkcGjg1mtasbm9q3qb3B
4WMnuehY8HRw8CeT1PB6noa9Ca3ftuEaB9ryKhVZSfis0lIVu6hUSYyzJZPFY4sqEnBmd21e+9U1
x34WtWDglIlVVWhc7GcVxcG04ZIZOiGkwXMmzErHxv1ckxvJ4E4dCrG9talGVilt97Ur+ZY2tSrc
2M7G51zY167mpRVRuW8jPfeN7a13MlVF6i5gwOS9a5N+lKY5KTFRx3szJjuXm4o3KLGRitWslHPp
Vm4OGqu9ussrbeuUNbY4Lmpy0U3qqGpuaM17NwXLXBcvamWjY3771rq8pt6eboJPYkxjbQmqkKc9
LZQtsROBJxllqJxXlhmBdOnMH6h2nF7zzwr647Q8odHZPBUUsayERUQVUU+SEPk0CkpQQqFCc4Sj
mdn+1I/eypZfYv0LbLfRVcrSVWUjt9bgyUX0oh4BgfENUxKwtBfJEN4qLs8P8IhkKJ8hP+h+IL/4
PxDg2iovgC/8D8wwC/PaKi/QOj9BP8iovzFE+aIcyIfREMhRIUTjBd4qLwAvJEMEiNR8c5BIuKRD
qBgkRYc4eIF2AugF5dIYGCFISEvc7QXyAvwe4ive+h9h2A2fDnH8H1PxcDmEXvQYCv1q/rLmyEZK
6qwSuVkKrtKRqBVJKy7tDECgBJY4BAQAqQgGMQ2ef65Fi3emTTDDOoUPrdb3wg5OdzmlgzAOZy9b
hyDlDig+QY93tPA5Q+B4H3G00u8R9x8DAj95kfw/pwf49F7+9NjU/4Nzc0082L+jivVcWpo3ODJ2
OTJao2OWTxa2TFouWuDY2ujBrXtbPnotXKsnbL1JEnsSdGjhOtrZuLR7t7+/tm5lNquT+vlwd1W5
2vRtbHa4km1/k9VSS9ycn+LmNH1znTWpRT5RNndTU88VLJ0m9wfJJwd7u+nBInCaNhi2JSIE5w3y
qPXi1yMG9tfni2fZS7Uk7nuo2Naq12ux7qsfqx4rVXyUf4KrXaqzOCr3WsHw9FjFo2rGDJ9/Fri2
u9ycnJwZtTgvYsETgscG1cxb1r1Yts/umtqbWpgLWxg2NTa4cLF7RdL1rRsaN7A2qLmxm3uje83V
EQlShvqlKv61VUsklVaKUUooWUe69dc5SRGbt1DzjCZf9nIWf5N806PBvfUqo+m5weP9RIim7x8N
xV2tq1x8e94rcKuDGWrXY625iq4eDco2r7GjUtWvJivWM2Kiqi9m8lGtivWNj1nm6mxycuWS1m4t
rvXMMMGLU5qL3Bv7uzkuWtrbww+0iVfuyfPV0fs1YUne1/l6LtHrJIfXxOY4ZLJunfxd1s4vQnVs
Rh5d9LdPd+EnjCWPBvaO13PfuatevOzY9mK4o89jU6NbR7mbeNTIxPf0YuDr9t7ukTxaNHSRLnBR
uZuLgz5OL2WLnakiWy9k7WjWxd8+U6tMCUrrXwtkpKSho1rmucuWTuaDa72bvfp2k2LW5xXujo1W
Obo1uThw+GLJJwRP2dz/86X9s6Ot5s3UcXd9rkif4fg9oTxxWL1qiqj2FrhLV1laknY1GKqqrra5
4LVzgQKG6CIFQLA8rTrxwXhXJKi9hMDNCKlpcW+1wlRMEFwfax3Nja5NzgvVVbljkqosOnlJSiG1
E4zxgrwr9Uj3QwPQ8QgmgFgXIBPJKS2cnY+2fZe75e4OLF3P0o2tzU7mDdrwZvp4TYwdjPRV+12L
sa255Oanl5Ov3lGcJSUiTm7EV8/SeRVVOzrx17X0XIZzDuDMoCmw4CezUyZokpaSMblVzLesB1Yy
EwGNmrX3OuSR2PK27gqq7Ho8SjayaM3kuYO9kwVyWvFazWtlFy5YxWvRi1u1rYPFYtbWjUYPZual
z7+/ZmxcXJ9qLH0S5tWtyja4PBcSe7evUeaJe9v84T9Qn7SJrdRKkl974e/fc+pR47ZrdbByfs7c
3e7Xgz9m++lCScCeE8nc/L7aneTc7HtkzSJ6fho/B6pJto0dGxYtnWfa17bXW8nJ5TNZKEn/2v6X
PVt+KPv0aLdpE8K+Oj1aJE/gST2/10JJoxejqcWbNqSJ+74cF73cmtrnuTvYLvB4rnk3upiveyzc
v7fuSSQrXgZKfLg7lW7YoxSJ5kyYzdc1PCWXN/X/kj0SROqdb2fw1tiJyb30x9nW8mT5enySFVrU
/OqIhPSSTbPG+JJbCThIn+n7XY7HaDOfu+PSVPgHwsSeSRRHLufDpYTvXPR4DvbnW3wnz2vh5LXo
vef9j0ZvJ8tvo2tbB8MF/xqYOa1ekTqUPdh+PF2tihNa5ftXM1yROLFg2OkvftO3Jz3Hi63Bsa1r
0v5LXW+2LzVbZ4fRJi1y/U75jP1PR2Py6b3i3s3cdbaoeYro4vd1OKPFSDvHJho8R4M/hzXZyI7n
rPZ6kmpskcEnYMoTBhSisJqWCSqJQk+NS94MRJW3p8LJm4HkooUhRSlIR2NTumx5NzSQftshPSw+
Z7t2XYTTq9+NHZ4y5lUMx29Zymg2m84jr1OkaegF4DuVVTJO9/J4uZ3TNE3/z/XBqYUX/GyTNSdG
axvmHoufS9lmifE8mbwWN7YxbJ7PV8vPq7nBgfg7DuSboTFra+vqrWIhKvWSCni2D6m97MXbLMET
lnWT9InZOb8erwyxJL1HF/LriYPpi1MJurvWaKRJLtsosaO7mosF8EfgT9329PE6Dl0vTrNm0mBc
0i5zD3vSBmVXu6D07e07WzDrPy622aWzW4uEo4ubBRIw/LsJcgcXi8nxKvqSQ2Op1rKdFJE3Shse
ODIm2rW+rDd2dLySqWc7J0JVPd/346Lute61s1SSdahJk7ifDU4vCZEmpznQI0JtZOuU+KikJ+v1
+pEza/6pyGSJb2JqVNzufp6Nv065EZz2avwYvN9DHJy5KWdjucHco+nFzdU/s9Xe08F+jxYsnB2N
jtamGTUt0SMUifCsJa85i4KE735ZOTwcex483zgyZNnJqx118H7pQeckkkdqVklFH4n3a6Kzkz+W
j2XN7HKbYxJPiz6nRq8qtbbM+DtcU95ov4JEtUlJEfW98fvZA9s5bAzlq/0Kd5ueE3nMPqvVq8gS
i9Z7IiBhCQCERREFHufefqEOwNH2nUNYVkEiyfJJp1ti5Yss+53ZMSej0XklhlkpRrUVlJ7NjQ6m
bhOPylXg0mpZ7HVNnQb1qJciYTWCsJ9uis4SJ5CszanF17ZyvSg9lVVVVVFVVVVVVVVVxgdJxKpv
3HtcG0nbhRewN6qqbkMyS17O1aJYiP1JBc/Lt/SmmfFpCZURata3nWty8k5vcokaH6UepNaxY9de
jSE7jSk/CEqSWzjP7hJZG15S/sIYJRFJpjhJJJF+/+JJrhP8yxCV8HI6WTcufwfwn7DY1w2sGj2b
p2Pl9sSTrm59LVm/UqomqsifnU6puueKfwbP1Sm1ud7a6LXev0cp6PJ1JE3/6yCRk/difzUdctE+
m+qcKSDSUEO5uV7eX4ze58WaPFY8Cam7NqeL/e2xweDcxcW/ORwmc/Ut+/F45g5N7z5tT+Q/DxZu
rF33k7NFuvlSnVJuXv4r62iYCS1wJ7sTWwYPdrWrnSdrrtcG5ImRJkzZPJr6cHiy3U4L6e7R28Bh
DRpo787pyZNGTqd71WRJPZ4ObNY7J1PIm1eTwdyrvfDy65Canm83ksWSCRjS+tg2LauonTr5qsb+
5oxciYLDNY6nk4dTxb9adbl6sWqSR27W5mw2s2DoOvZgeLU0RKRXPIJhmiOIxxhRECMgCkGoU8ox
CYXyF6AqphAPG/yeyROx2O9ewYv/4u5IpwoSALOhYWA=



