# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: joro@sun.com-20091106134332-l5ssd4q9u05r2vki
# target_branch: file:///home/kgeorge/mysql/work/B46175-pe/
# testament_sha1: 721081ee2d1918c9e5c271551468a538737c75a8
# timestamp: 2009-11-06 15:45:33 +0200
# source_branch: file:///home/kgeorge/mysql/work/B46175-5.1-bugteam/
# base_revision_id: dao-gang.qu@sun.com-20091105063312-\
#   o8mt69oppzs9o9g9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU1QjZ0ACYhfgFQQef///3//
3+q////0YBIPnqPbR192pIaBoABQM1DFHbuoC2KFaarRtbWytUg2w1hIMkFJ7VG1G0E9QZ6kNMmm
mho9RoyNAZND0QGRjjJk0aA0aYjI0MQwJo0xBiNBhAAYNVA9R6jTQNBoNA2oaAaZNNNAAGgAAEiI
SEwTRPJTbQyaJpplNqempoYgDTE9I9J6QyCKRCZGp6no1NTeoQ9U/TQnpT1P0p5TT1Hoj1NDamjQ
AAEkgTTICZBMTJNNGmU1T9NGTVG0jTIPUfok/Shp7Sk8hoIm1P9mwi5qYZWvfVgZVrERaaiiFNuk
7JmlzKRRlGM+Z4523fy9fjLkGP42D48OOm7l+mQ3DmTlOFf1aQzT4oM0hkiSYL+cGc/7IP3dOu6x
xpsve12ANk426wLIItYv+CBaLUmnxoJZmZmbbFOeI1eGUl2/HRnMF/AaL7lqFa1T3s0/q1pPn/9s
vI9mzNhGezdSdrc7ARmJO8EbS0noych/fsCdOfezerN9ILxJciLMhDbbbYNpsY0UvHMC06cNrleg
Y7g4uGlVqZGCcEUKVhvU6lLphlHGqlqxW8V037q0alxeig6XoutBFohhce6I5ebuwRKIp1YdzDFy
cGgA0kF9CkA/B4LBBA+AM7BB/FZFjH5l3U0MKd55YwC1WjFtnEvIBEYj+PjmcPZ/ZnIvF2LfycCz
V3OdvKWsPns3M4o64U9eWKp0xhrvUuMXK+VU8Dm9fD2ihbiYHzHmJFzTsVjyG90bsnPir1MZhNK0
IPbbvs5+mL8DAKVAui9ypJf8VsA3phmDKy29jtywvplIt/DjGcbNLnn5n6GoOHDh5HIAVFSgW2ck
6FEEAK4Yntc5Jjngxt1ErbmC5ycthONi93no3LpmvgvE+JMyNwUNxN3v+I5z5UwbFokqMOPjO2Xh
p8dbcuXCqOtRpoptYOXklUgvF3RBEMEMO1h7jbJxN4inFfK0DWeQOU4zEZOyh8DhGXwkffxdZn8R
0A9nU6jxegaLaXT0gPYuv5jobbUWOce0gc0E2F4dQ0ovIWlCFxnQaAB8nKHT09GQ3g1CMX6hRMRN
HiLE9iWyYLvBOeiofwUFDtEZS87qA0rRtPeYQhryO5hrYXGzCDY3WddWEcROLhkgT6gON4qAtILz
n1WtyxEQoiA9aA6cBtNjpkRtvN9BiSD6GIbbQocN0RQRPBKHuqEriEcSCEOQkuYiCB6CybjxJ7+J
0GOZJEzFwk11LCqIoB4UHADgd+wLvLpBRMGhME9WTXvwIjwaFiEJlIQyDMxSI7DQkVLiJU+uYVKm
3zHmJiI2rFCyubJ7MIq52Yx3BL3fwHjEDtmeouejRuLUvQgzhG8zQhVMS3ySJZqhB9/M1QGAFGXm
puY603cndmymfW7jc9amURp4EwTzFlcqJDn17Rz9sprFzxzgcgI7DSINEmVSpQsMi8maxXlW9FTe
ghelz/LkOOYz9UjaMbDYFTImLYPHkBxU2EhI1/l/f3b+HNssccTqQc4vnN5IFvCK3iAH5naXTZxs
HJXFow4GOpC4HkFHBTOh2BePUVJiQzmZwWBca6wDnkSaxh9s5bIBypZt2bekwgG4XjeLjWIzh/xA
b5mNaJHELzqCxhk0OL3uNeODtRtCKG1YnNogrQVFv3wTzIm4E20vuDAORAFWRdTcPBPmReZFtaFS
yjEGb3BPHHslBNmYOHFBxiVJHMKUyN5YajzMeUEcj2mgOAJHtWTt1GZ21sm3ojINiJKSRqz0BGx9
5HVXlgbgigNhaUBbsLyY7EK8xq4aDGJbOh/FQjdw5BKJYSyMChnniIfsLHK1XkkHhgkT8bTmby4e
PBiRU4jH1GEyPWogoY44pz+LjToJzzmZxEQxOYBZ0uIjm2FeF1oUN4u3EmWaKgcKmwYjUeqHkbRG
BagLtCw0DiVY4EsB5gbLWMk8iMZPUzUrNBOdC/gYq7vIkSBUuLsDoiZ4BiCyNoJx6r9c8Njm0I5w
nkG80eDwZBFDAqEkSpIKQkuOBAluvW43FCRuttXqLpjZOB6fIFvKGugxUtLShiXkDQeaoiRD99wX
GIegOgOlbeYrc5VL5G1BocTfGuMHoxvGa9hlxFDIvWib+MZvDxGisyQmpNMXqBbDmMLUeSHop2MJ
QIGowbgmRCZQicRx7Qoi7hY4bC8di4ajICGMriEyoaxJaEh2UeZC4RYSvH3j3DzgURMvLLoLMwLp
KUzYZEipYZFC03K8Atjhk6wZUa0PW2FisSMp7S2JJEUIV5QYecSdhsJ9mhkVWIwjdTFPQVJzLkGm
ZmWFmeZQYp6angAam40IG5Xy+5cbF6QV6yFpG3t1mSgv05FmafI1eQwQompAsq5FU1LbFa/kOeZj
bXBTTB4xwlCd5ImVUFQ6+Xu7oHf2G4mqeKaD25a+ZMMKMInAnvpwmyq6WSSlEpjCCUKFx/fEeoOh
/JT1vMzbGTMhoysmkpOwkSfGZOo5xZBoDsFQRALhS/cO4zB8jd+JUg3Q7WhNd5ooa9w4BMaGHCNE
NjZ3pX6WKN0O0JKjur7GlLDTA6oIx9R85G7MaCob/vp3XGjaYjQNdoZ2DF7ywdwUQsW8UsDC8Enq
KA4uLBgsJiqZlgfUIjiB+oGOv1CGpULmcZBqZkvtLgdPTqA8gMYh+xyOTgmGAElu4Bdzj9AY3FyM
QyOKWoROBYPMx6GDNERWPIJTVQYeBEBKJAsMJLllDwh8mGCyaHCicga0Uwqx+5ANHxGiMMXBahS2
sGQd4bhTDqRcFo2L19DQP+awc50yxwfvaX7xipQ1B6mPJE0mEpDKroESScKpaFo9TIW3gxBiLiUR
TIVgr1R12Xx0dkRh3DJZug45JAxQImAqKDA+6IAPNHnBr0grqhJcEBPdRFhjYL1x6/ncZ4kmUeyZ
QZmdgpaeB+J4FJQXHtLyDIUmcAqfo8/0C+No5MNkHSpaZns+er7SQYpkw35Ezv+rjD3nnLFhX336
g0Xvtb5BVQ75CNZWH51BkPKKcjcd4uqNBVh/VjeWN/RgSo3+ojB/dhgE1fo5zOFgbBr6QHl3+9u5
fMuNoK5bQb7igiv+UDxPzY3jmO42n6HE9gd5E7j1mwcQPI8TMmbjAmeREAoQLonQGIhkVPhpsCAj
yYO1FFz7Q7g9i+ZZxqPDqXoAbI9g5DgZB/U2jzkUNh2HebhxIx86o5G0kVPB5aUH8zTM7HLzZX+V
H9wYFp5CuNQ3BE5BozIaZmU2nQjJZcUe4LjJHuQ6K1RYAVzT/PiHewVGGRGqHylyY40PjBkp6BJh
nxZfQyngDOFaKxENQeUIgnm1imxxmc8Zy6y4sQCJI8h56jwBWHoOvTIFkYmeQlYYm0iWLQ7x5cYm
pehKwvVSQZnPmMxvMuPzUQaK2HoAKGhkeJcahYaHrDkcT1XGpYcNU/zSIncGR1cveih5F4wseXot
qwM49kPXtyrGxBG9EWfTaScF+Jd0xG2NlY3HpnWVjnN5uAueBbMnO67gbTmZROnPY+2DrXyOBQ7S
0qQPWYHQlvw+8TDGxCuF022OScwzbtwKKSc4CIOS7JDtBvosTIbojH7672ob5nkciR4+vdLsIQyD
Owofe9Z9DKzuyAz2kN5tRLwOM1NFiDYgYI9w/xc5OG5Te5jaoQPd0iomIolhJelircpugwwtmxFI
NVKlghwWiKIe4UgDP73quYOVKCoU3WNLrDpI1inoJGsykyRymc6j1DHUmMl9g8LDbMkqkSh5FphV
IgOSOSORyQf+geO0Dx4JGNUW3hmHVHqC4mkSR0osBUrQJyciPCBXaTQcDFzHOpsLhRG+mNCGWQwx
pasTQxtOP7LAxQciYj7EaB1CIj0YofASGiRg0elohoejYUeNMKI5PwDCVDcDqDJHE6oCW08TEiL+
xFI+Twh7u4Kh6QoHRQbe4p6RXpKDKO8HjYVdalOtDUJ6Eyic5zxSB7mQjvRMQ1exlY3wSg7ekuMG
l27dWbrXIt6YU7Q8yoMMG06fYsVmr0bEkmou7EJRJHydQOaSTlGJ5c8TEN3FYn5UA3reH4khf3eZ
9Bg/wLxMnI1gkTDqLwdCPMcxDgahD1hWdQtgVU4zSb4OKtHCHSbAD4zqepOLPxksAiBdrMXzg9Ls
Nw3eQAjGTD0UDfx1EdYwQwMY4Q1VNltQCcmVLHBJN4bhjBwHmRQfcmDQKKdcvUOR5jjqip2lgVme
ER5zbUUDnpdaycJxSjTw82x8lJLeiwd4K1cloOWXcHtMS0N0lgkOE/MzsN/wXKHWjUjDn9pqBZwy
hjedRCjG089JJpCHuiQzJDzBqDuCamSBbmpOCh30ZA+YDKMO1LZJUyoyTSasHjL15mRCEEQJQpSc
KZ3a47cAXiEB8KAGRBJVGwYXFyMAgaaD3VSBOI9JNDzhgWYpeMs48QeUO2RwMm9QMHO8RPAIn6kD
bZIC9faG7cAQPSAlkvdzTxbQPC+TNhB7WQl2yia9ABnEOBqOF+WUrlDuOg9JyQFvmEUHh25JbRvW
cRG4IhfE967gD3WpaJr+CscoLIJRoiQHW9buFojeSSnXf6sADApGj6QqxSjc6A0pyhlaS+6L28CE
qKvNt6p2YZ3rQzRyEZgrTiXBvEj0B4FD8AqHxF12svAO0tQ8No9g6JmiPPEFByycgOJYtAnJjDNA
6y5Lb8rw4SQMwInLszFIH+SOa+KeB2phDwt/zyWIMrWIa8gilwI2EhGnwJJAZ2l1XgHLvlPQHFLh
DhhG5Ub8AfBMMmBkxiy58PygjJQmkQUiA2PiTVhNUwuakBzlyW2Y8Zg2Xl0OaL9VTRUl3CEwpU0q
ZmuG5V2ODED0GglLoHVI7RirhwwwwxbUZIMRFoK9OWxgvYCumKdixekmAiI+SEJyfqjrV1HHsLkb
CMOMCQb4fbFh5icnWYoiDwyLQpPES+h2lVadUywFNIyoBdEGHgGTiEiqvjEXjhZXltEctEostKgs
+UWIIxLEASpjs78nzoC8hozCbDrw9FgrrFp4auKFNETFvVsBBogkIhYQIGWBiBbG3N1BSJnt7Qcx
SOnMG8G4lPsKRPDIHuew30pgAyhcm54LRggMA3vsmiNK77IKjiDUhqx00lcjlSejGQt9hIMgdZQQ
SrGah0U4chuDK8CFFfel+hNK+lOwtB1Ndir2g2B5BkMjQiDGPbBD+1Hy951Df78DtC5HUOxGAele
P3CLA7B5PkHbPnABYIxmbXLeh3FukIsEUQtAcwag2BcwFRrSt8oJaJNOQOO7QhpSlJDWZ2gM6YPB
eezvOT/xdyRThQkE1QjZ0A==



