# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20100711133046-5g7y5ziyg2qcf0hu
# target_branch: file:///media/sdb2/hezx/work/mysql/bzr/b42415/5.1-\
#   bugteam/
# testament_sha1: 4ee36e4c15317ccbbc42190f0fa2df630287bdd0
# timestamp: 2010-07-11 21:30:58 +0800
# base_revision_id: ramil@mysql.com-20100604180127-frpxskur6ggc7cy0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ5ZzzQACL9/gFYwAAJ5////
f+//8L////5gEP9XlKQVtu2KlbABQBjowqCNAbYFCg0VQAVIA7hJSE1N6ibCQ0eVN6am9RM1JnqR
kaGAAAQDAAlQnqaaaUeo9JvVAMj1DQAA9RkaAAAAADjJgmhkMjIyaGgDQZGEA0GjTIYhoAJEghND
IKbKn6J6ieo9R6mmwUGRo9NTBD1AGgaNDjJgmhkMjIyaGgDQZGEA0GjTIYhoAJJAgACaAEGhpNNN
TTU09TKMjxQ00NPU0yeo81S2cEH4gtgGwPp3MbBnAzRYfCPE4nDwWE7UPCZ8/Xp4GHr/53dURd9T
LI8f+PAmISwTswmY3OyN6oS9a9rUA6a49Cv+c0/tAeNiZPWIdjlPTtfjidnmdjWEBw6AdvfgjojU
6PDGWX42lg0O/VSbYTaG2301TAnUKKjQa8lEi9jYsWCkZjOdMnmzwVcclIrbFIym/9pf9O3Mv6gC
U6ADmLxiUjM3IpD+j/9Q68ZZmrWbCJXI09oHa9Jp/eZ2FGOh86XvpcSTTbbabQxpv3KC5ksMI2WY
0pvqcU6Vk3aJFN84ZS2CbQPDU9RjF5OxNQOTMnsEzC4f0A03aGY7v1gLbu/rzjg2nDztpmYcDG3B
BZAG0A+DnNQaigcDTYQyG2R/AVXl1Dzhx0V1xaogcPkyVKEypVmpbg4hdS4JicZhrTdsP+DMYYWt
+erV5+kVUVj7cQMgXC8DPjKt2j1fN3gYHB/5w4UfyV1zJ9cg0cWUt/iK7/ZN6wSsvcE351AVwUzp
I4RgTM8B1udqcSzGppdwpAg8DVSp3eiXGgCpZ0uLJlFyqf6VyaGXsXRhPYlbCC1pr1U5ZTAXLBWq
IH7bgvAeGzUfkAw/QZB1Gk0EyYDChcSKFChQKEDgHFAXOOVV4k122bZAxzkaQlF0WAcmqenJqrE0
CM9+C81kigT7QuteDh4Dlx/TZe1Mmxs3DQ3+HazTFUxWdVhm+TsSxvx7pD40ijQB41tG22m0/xb8
CUAbBmKNfx/ZFGYZffXQQXTUxezE6O8BiX4upHjhDl76DAZp61pqFOdlPC4RxNYtIBAESsueDryU
JmrYe2uBVEFcy6w0Aa312R6GK9nWBdt6ojDoJEi6MGfJO0NDA2EvLYBEkDEj7RdwtophikNwJeyP
EQT8CvbkYwZ4F7owi6CpIBJMiDxwwvovkGPse763B8FM9vUjfeWGdBI2wRWIxrkQ1JisDT5QN4cU
ZcMZcJqG27i4TDUto2DSDZJamupIJKIy6BwvO5kuxfBKamdLS6ZAYMe9hQZPYk5MG9DGglxS5ShT
cIasGlaDEDpKASYiQhklDIoyQhxHAitog2TCswZkshTYSOjVnGcoBcChPYTTq0UxVA4Ei8YuK30K
sQUsB5AKsgljtJq6cgCj5AYuJhp+4DxXTClBwrFHd1AlJgVPICgcVxQYZRITcTHuSMHKstsf+0ol
wHG546RaRpcIHaD3jnOY1bfSg4oIkyGcUTlv6Y10HDKgmgbAGpq0rYwolJW4PTyo65lpzPURZUxV
QJFCVI80zSZxzI3nCQlhtN/ACVdlj6+QwyA5gwiWAYMCTqNxTXbbgWQ2aqa71SDyYvcQHVzWG7lQ
oyIPn2VGp4VxNrAvcYnM3liwGTjeTWFJvI6ynPu7yB1EGSIzHTE/ccveXk/IgZOp4DQR2AwcOZDU
IKR4i4dqHHN8tZLWQSDHcOLmwsByOXGrKsiXxyBrYQoIjhyLywcV0EzuBFD93YjM4mZPg1DrXMUa
Gbx7wIxdEllJBYUEMYE7Ia8yKi0aeZE34JjMyLyyTU+FIWREFzRppZTK8kRcPvfsYiUjoExThkBk
FuVBOYFWo/VEQ5so8s/xO9bYV4lr2GBaloICGEEBB0Sh+JMZmydvOExTsCs1opMx7iiwsLhuLiaC
0zLRDwJqB2BOTkjtL5is8ivkIOw2HQqJHQQaXbML8r3a5UuBEFgZQzdQ8mqcSOZRB0pw5O1HZNcg
7jdUgvGKjx5VFGBw5vNyjQUF6IGYeGejtQXiLIBUwgyjpe6lfwRsh9J9lrt+64rIDFUrcDYXaiCk
SIaUl4/HA20oJlr3KPMnh569Z49vA8RBhibdWrAaD9RFywIj5ER0m2wgTGZoSiZE+90WKRzoE5Kd
2vhyuLSZwcyYnGHDGqqV9d+AiCdUS43mBMBCgePiRnIOczYtTtGpEWk1eouEMTlsAeGZiTFxSd/L
jxcaCvNmz3YMd0EPKzBmuIipngCUIG1WcmBaIraWxWl2eXUXOmyA7zsZDCbFVVG4UKBikwJeDj6Q
N3kBgZcnArmm2MazCUI5kniEG0/dJxrMEkT01300xGOCJIPqAfboR5Byh694DBVlYtybBg237T7V
6wDAQrq888xICaA+9CrIDYo7AScgqZhDGB7L5EgYMGDCBoZUDNNASQGCFTCsgSmkFgMBJCoP904/
t+ZBAvvmMXlJMkA60A8c3gKB+pckB9hCWameQUZlH9CAloJJiSQExYtaD/kEaGJKdyQGjyJ/OCER
YSILAFMAYgjUMGMRCb9KQrLEKKqY2DgSiCVAF2JwBGgKpBnvICDItaGJWnpzpBIRpGxnqA3amuAw
bOYEmAJywB6ToJMKLo5lIJiE1zAYAwYancXAFlS2DuRiHAVVKAMMAYoQO8yVtGkiS2lO0jdMjuR5
1v5034fP8JJNcyPDJKqXPYHT6C0TcIoIqhMtZHYu3pR0dEemSqZBZMjbY75oCxpsqwYqqXAByBxg
RDE2mxtB13oPIdZ5iSX1azsM5Ya7CtS08fmsNMerzE5UIJyVk+2Ixkl7mZkI2COH3FrKX+ei5JPm
VNbqCVI4MYwLUBDsP1QPeKCtNEDxEDRVoE+KgPOCCAFHl9sDftG3qkvKzafgfiajClHaUExxRWy+
cZxi21FGOJhF0gMwcEJzGA0Sq2iW4MYOrX24ICTfIy/j76MigpsJwExrBhMAywMzWbTp5DjcTkje
pQwytK1rN57gVQ88jWd5cbP4iCJT4nnuH2+chMVQfBBuuQkxi/1IoR2n9SS29/qvNXlrqHsI6sjn
ucomKQ9J6gdvmc4wjTuwOJskbB5g6gsHnjszImSDvOh5maCwixqsSTZAzHadV5lROVF/fa3QKDTs
XJcRLeyFhA/fvkh6tM9jqcgNhDUTS0K74bDwOgLmPbHjQDH6vtUpSSZ61qM0GhpVAoGadHkmgclW
WhMLkQwneKYpJXHEmE5SObcnjs5ti0WSqgyGIxDjAwYNlJ3JVpaCQaK9ka3MYJXiGCPYb4zGZxFK
ZCJcNNvouKZyjQ9QTmDWd427z0JLPI+KNRE69Ny0PhaczuM9KsW7Pc48QNEIsVhuXEEuC9RP1gjg
hPTkOQQQhlMhzCOy4neC6MbCsgCZdaq7a3Kz5E6HQSnQEVSCtgjPuBwiJiSckm8pFKS4lAyOTCrt
F4AMdwlT0EDup1NxeiJ5HN5McvAeeHhYrKBsJUXiuQ1x8SUgGkYTrJSICJyK9LH3MT3olsJOSyUP
gnvOPdkjA75Ckwjd6rV3D/M6Grh6VK4BnskHEQOSDqQSLSdcUjqRgc1LVEvRisPS0RjIvw5I7vYy
NqXkXMwy2WjvQAvkzsx6RtGQp0gvm+WR9PFIITQYb4PF1tgRPcIGtHQOzvSTRSkqpvkALBQtexTE
TVJKR7mclb2qEspRgXIaD5p5CMrC4VRMK24rQtQiwyqWrsnnmekDhFoKctSGXRl8/TtqvVYj42he
Bty/V4x62axEKtEZAsl83Gb1mFFOxKIRnqHK5l3iBxilH7PY+z0Jj6sttPcfV1Kxij5FpVuvRXz0
Zgd/VNMWfsNtBMIs3BJfGdfWbzEyG8Rnbkj0CYRBwTKAEQZBUg6m4li0t4WpNA0so0oCSEaSLHip
rId5aUNDHnkTE4QSKLaz5Oed8I6wLEhpQSsMffqxJceWK5sSBLfuc9/I6hszFBIwArAmQLtiPUQT
hTy9DUrEVrO1EkU2lYFTq0eBkPS74n0F3Dj/JrU9WCyyA2A5imYpIgiGBglUKCGM6aU7IA6bWPEB
XgVpDxL+QUJyRpQWAHub2DUi5Gs3ZFeMFesniMQJMBpghsS5SFwkgQ234CaIMB4sDrVWjnd3xd3R
B3jmBuiCJjvxPNAGKgwibTcR6mVhwNQp8xHo48Rj5s3n+TvygdyO/4J5urBa91q2O2ID/QE/rRyN
NBTAy9d5bzQjnOPKTzDvr97JMgZcT3HkpwMLUYEChR8M6YwE4PdudZ8fTRa0U5iDMwLdAS9hjfMj
2HGe2fUyGZltZPg5LmyLjWqyRAFOIyXj7yqCQouJ3muBAClDINarYPuXkO+os6vAoCbMXwp5Hr23
pE4LijFTJHFEafCt1icmXiqChHbYFVYVDOcMi0YhWjkpfGiPamRMx25G5V+pBBEVbF2CYTAMkW7j
flheFzMwMJmWYHrT4H9vgZC4ly7a6UERRDzYHpZ2k9TshEUvMkdFotrCoPqxDZ/el+TMzbbbbeKN
4tJKQ2NjY2SNQd3QQuEGQhlSB0ZDwWSWghrBiSXgkiC8j3nQxoXO0C9hrAikpIIIW6sqZZKqjbMI
NDU3bYUOMZaqrF3gUuYyqhaBH8jF7GCIGKGEDDlYT2HjCHMOPX224GBX5pwWpVoUXDCTJ6sIhuKw
4HyGcHkOHbfCdB+IDMmRrLjaCaxMXQOjHzggXSQL0XEtEm9Z0n4H2/Uej2HEEvJkUsexL4otxyBd
/UgrQxKJJUiTCOKCdkEvUsQ760BSfe880Ue28c5pvrPw53eBI4arSeCUGSR4+U4HvQvMj4LpuViL
7EE/ApunRtP7vugbmrOqrIBcTqn4HzMiQjeaE48l5WLae8cqid4w5Yt82Xi4qHj2FyKy4pCEiceq
D4cjEoQGXalzIAjcR40/EoNSj4jAFZNo8GbxXYBxogEGaSp2CDfEokhgUiVhQZlgvZwJiMkKCyYJ
Jsl+TlglAxSoqAYl8d9oglNNizpy7HKVFA4K9P2HxPP+4u5IpwoSAcs55oA=


