# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20091002062025-lgkff7acuuv5agn0
# target_branch: file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-\
#   5.1-bugteam/
# testament_sha1: 91aedc7bdf8bd0cea60c7f63f959839641418fbe
# timestamp: 2009-10-02 14:21:49 +0800
# base_revision_id: davi.arnaut@sun.com-20090930230608-\
#   jajp0ho75184xpkg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaoCzJ4AC9l/gH8xEEB7////
////uv////pgGD7zdfPvmxHqPo+x3u777fAfbnRewx9tJKm83goCrK9jpLdqNda64u2jsUwFtm2E
d17ekUKKeC7hkQjUyaTyaankNT0I9SaeoHqZHpD1DR6QDQAAA0NBKJoI00aBGgSnoIE8EDTQaajN
QyB6CejUYBMQaAhGUo2kb1R+qP1I0yNPSaYRkGBGRkyaaMhppkMTRhISRGlPTBMpPEaj0htE9T01
D0aRo2o0yaYhphAAA0EUkaEADQhmiaTFT8p6mJM08SNTT1H6Cg00DRtQ002RBIoEAQTCaaaNNGpi
ZBpMo9J6aaJPUaHoTJ6TTbVGIzTbiVg2/GNEMQMMMIEMIkMDAwUDnUYxNB/gvsP0X7qlcLzFEGec
iQxpLser0zquk+Rh12brbnJq25ptxcqxLhMIbMshcF1EnLV76rm+/+p39/H8qBytpv9UefFyjBMK
eYQhMXA+lYZNMUMq5WBoT5qJn5zBxHCpn2zIsKVtywa/phSYRs+K3yrPVVFO052TlD5NTNncVyPS
CZTpzBmJLx2wvIUN/YahrS8MeeQS7usoW2/SKKidyojRCAwvf0KHbk5dhIz+fKr2fNrWUv8qTJM6
+qN+XdQrmCysU2KjSWx0aRCHQsmbjUSlWWvZFsSLvB5uzMdCU0gzGrndXJRNr11SDy5doa+PMVQo
Enn1Xtcvw24rABDKqBBALEAdZz+nr662g1Q6s8lOw8v3zj2jYeZwP9kqSjPokUQHY22nk97WUiet
B+XfnA7QG2mxttAxpNoGzLVtzSxAAMGTK3x92AlKyNl10Z0lTA9UDFDSu8uUamGOBIduK1DYHOKC
Rh1CEzop5VGFcZA6REIIJSU6RiwpfeRGdRlA5HVUiVoIB0mdGQSgjHQyTtVZH6u64wef8rRNk97I
LaEtXeenq62jzLgpFKP3I8kRkH4o34tzWHZ4RRDCR+WaS442/tR/FVkTEntQ67FtZ3GvMRI2lcJT
IHgy7vPpHYrC0qdTJrW88L7ifi+mPtsLHbDovJeFsvBZWX8RUhugHJaLDB3ZKhuN5HJQW6StX2XN
ObVhDXNRaKzJkWc0VkP/6u0le++WLMZQgaEGGNYQiUFII5Bkc9ohW6US1wOibZPKiwUyFJMUjuIE
Kxf+tExFQfHWbIsBzhTCpEYGNb1a95WzpUdal4EmSYUmZwZWcrkiIbbFZJaouKo9Q3Y4Z5Ay1lyl
1ybeaEOE3xoHqsU9qg4Efmhp41uYBo8ePNuZroLnoapk9kdPdTg6lHrBIcSxlfIGMHG/Z2CSIvvf
KJfh/zM55FKLKZwLoRygZoqrLJWXArdNwW+TB/SBey8cc3B5lUWvtHiPCeHV0e+6PLxLzte0zjxF
wag4XILqqOFc4A/jKem7s4WwwXZ6aq22PCIi7xRcIMCuthgO5IJGMh9FMgI50B5BAO4bE0mmmjWi
KG0ztg0dbz2yWFnMQocLR+z+JZ7ba4sbs+9iRLjkehhYXOOMN0ZXmnhMXQGRCG/F9UPAwfx4Nrxq
M2oLYKzXZ9m+rhYQ4FMMMk6DyHaKSe1aKGrFYwq3T2EShBkBeIa7iz45JfJQ8kIWVFTqvjAEnQTo
adJ1WsHMNzZDHpEgpgV0FojDHpoTsQ88VcArrxiiyJnEklzfKLhWbZoz5jSqcBtoqFUjZ63t+lDn
jBiKgTLQ4TzAlSXnC6JPyNKUpD0GaUwJYIp8Kc6rsttxu2WCimTxx1Fu3bNSXfe3j9vkGTRltFSi
olVo2NptgLeoVlcEElItBSMoHA4rMdIdz2pqKCjrtNZ9WPwkBjl/hnYZhx5QHM/hhLdcPpHIA52C
6WkuDEm99PZWIs9lD/64pGgFLHJXCgUQiKEi3eSFIUYFxCAIq+FBNVAipKsk6MjtJFgyYKqoUYKq
IIqkqULAiRpBYhSuuQyhCorSSpAVBTSm0yV43YXFCRMib2aTAkdaov0IClqDFpNovmOCNCGVynfV
VkqyuxD8p6JJqNyuoVmdCGKTF/3JpfVxAkvLBiOAnrBYxiHFQJEGdhZbzWNeLeY4LOYPFlxNMgvY
KClEG4UdAhYzDJmyVdNdNnEaKGoiYP4FbYaWOSST7OhUhYod0TcUJWpLhwTcgfgmhzAUgORELz/C
R8Gd2+mSPnubg5wzLyIaRuj0s/lvAFaCLxWAiaIXWWyym4q7ywmjG0UKhUgxPgK9Tq+XePikKMI4
vJS2HxjVjWmUDAVqAhBmZeuGZ1B2knZGgzV0J7EYuNR4I5JGh6RQzPKjFTymG/3Ho9IzL6Idzum2
ORVWVbM4aOzUMoJDYSIzUqiB0S9eovvOQna6hNVsZMgKjJk2o0HK/TEKCAh/Vwx3O0sswJ7YLTYQ
ZT8jjTNJ3p5Hg9yGZYXbJ/dN+sHcKmrq8yXSMHssNrYP4wffEYbXkNFAvITLSRAsO8+d18cLAddd
Klo7BJEyUpkEkYkegbsjspcUHooVGJJSQxn3t6redaBnzLZkBxqfuSgK8iTIIYovZ4nmTJO0dsXi
kpX8uSUzauRQjOzt3Xe0jYhFvVC40ituCXMpjUlt6CRiZWoWC7LIVqtWQiKnFFx6p5LDIYDKCjA6
BnUYabDEwlpITu1XVFNxVdXQoRqFKJhRlCyW8ibAR0HmzBx96gWHrG8WXDkOU5VKngLxHWIy3BPR
RgRlC4Y0a1+1kDVAuVGTnvBB5AfMVOiXOuQhHuzvFaBkSwsCARKQwwMScthiYG0oWiMSy/puMVaQ
VwzScTYVmuZaSMCCSSh3E7BchwTI0ji2Kre9m3BHUSJi9IxHDxecosVMUoh398beMTFL7tRZopkY
WuY6D5HqJ3TQ9Pz28FoIXZDkFz7btmPbQRarWaARxOCgTJnITzdu4qLi8sJHYusvW5dMOHN4m2/P
ufM5aJ3ZYQg76NNrSZXTJGw1siY2dDsam+hGxRUWNEg7B/XI6FS+BuMTHAyGL65L9CKXlpeFtSZc
SLgvOnVpu1cZpo9RXK5UpS5hAYhQzjvIyoS02k7KiE7IBC2h1QW6AlYGZIRxfbea6jPLn8MBiJUm
FRxMvOrTogYY8TSJpv5fq7Ik/vIqmsWV9i6boIycvWENRolWrFREH0C5pwE0E5kRFBNQggk7a6SN
VUoJFcreKJDxC4NDmlyCXWoRBZOvvSp1jCx2dlSGJAOM7AvBlZ2cF89SydJcfMZ+OWGC8jWvuLkW
svr2mTA13dyp0TNkwt279Y22ZCEYNg8AMalIiAb5VjXJ4APLGEaoydn6SEvWgoMEfnsMK/zKv1+y
qgRBGpAHKwAh7Wb0MPvH8XuaR87uan3sM36m+DJofie5qe8CGlqbzJkh8EpZDY+AF5KHvh9jD7mG
5MixEMQRU1vBk+x/M/41DvFi8BxvGBZJmFL9jI8dr8HC4SZgY/2fAwtCZIPAqdgH+fweK5PcB6PE
R+DCfk63BDyvKkm1DghgCWxP6YUuUU1yBkbH5kalcth6Wf+Khzr8cQ/Fht00rIoR87hS8ZgPlocb
aaHU7nS5CEzpSiZMrA0sJpi8aR6W+HAtKgxv2vtaEyjzWN2UCxpRITvfY+V7WHlMAaX+rtSh6G13
usTIzOKsONjrbgN9CJcbjdqaUnAEVSSEMRtoMafGQXsyJ5WZjcvRLYEzsZa5xuxtiYGRfHgU6H62
1Dh+2pDe6r8MGZMbif4P3gcbxOq8PEZEl93AtZSlseRmnI2P2oSShyuUbMDIk7MAaT0kFL1l/a5k
wtAGt9cHUBgiW1RNZARFH9emZFWKsCAsF1nI6FT9TW4zmToA1Zjic7eTIhys2wYhpyMm+lSYPSsV
96rtP5P8NBrMoHdHgBIIpSFIx+1fZij7F/u2/sPBeEo8SoDxnjprlSTWoUXiHcK/yWcSKBYCV6oC
IKvQRI2uhgLBYog7peniLJlAMLrY8K/fRGUmrFYK1l4wJqZlqJE5QMZFLZL34sg3QbwcaGlhpMwg
8/pKNJzH4ouPmUWdSHzHjHHGlfOegd6HGgwHYRY7HVgaAhywFMLzknFPOTLALmNIoCIgWjLzQvtV
y3YWdMeb2beV86e4jZWCsWHSUrpO6QeSlx1giqoNvnoVo7pAi1dMrvvgq1bYcjUgOgESPtCWYl2z
pAZpVEmcwYqgNhYDJZMkBeBKAM0qZsOkLC6BLAmSV9O5e3b6Nw7juBlDgdpMmcUb1QkbBnWULT4X
/xNgYlZ47QuGKZxhofUI8Ey+C+pRIKMW4vknhaDkN1k8MF/dnaHlbi6vvETPRpCkhSjSZjxlRpeX
kLjUTguKzMF8PUY3exM8dqbTMzKJhgOgQ2G9Z91Bn7g1r0jLDSajkKebKXPoymY+SxgT0K7Rzvzh
D+CZFwkNgAcOJdat9XvDiCxc4XHIsBLioYkN8pKgRudIuLNYpwDFGKpUKTBqhho6YH9pE+QJWxi2
I3gSCxUsNFsKEDj32rsMTYHALcBwENsZmEPRoYaBDM5a7UQCatt0hGNSJwUFgPuM4hgbu4DRJnmO
0YfyX1xOtGKe85IsqeEvn15+BI1tdYu5dR5leXLQgrwXkvI0ovwK81XoOQIe5ewwO86R5YVjQYyX
pnMewoRZB+hlBy6gHVVLIDnKQHDrCVsR8VQLfDBgInCRZBTaUovjeVFywttAhcMCq0Ww6yolz+zt
7yuHjWceiJ4ntZFcGrbFEcNULtEpPGNWmTBo0qk1IaAKIdRu5TmcqIIAVm45Tn2JRLI2GUrdEsJ0
LoRwqTFY6LgW4RlK2Vx1EbhV75kE0znGFEMZXRiaoNyJHqYvegkQrOPzyAi7MGiZPSZpNMbTTY0N
MbEm0GADBRttQFv48Cl1F1Ctx40OZdsgk8nPxiBIYliyX09oZ/uJqBFSIeDFRdIq0eARBCmN7UMW
3s4GqklnFtpcnGJaH0kKEoaVMXAJFY3jLdVM0GCPhBX0uQoHWMMAsNliuHK4sdY67FKqRDzTtM+F
TdpIgZHrgO5U8y3lD1nid4b5IrkUPSdhEPA1jDoKe8rIFQI8Sh65ceLrSRqkCJPZNRiJI8ZRBM04
AhkYoEjnSX7gPm7QPIPBTQRmScngdLcl+7kZq1DYNfzi2pL1HqV3hM3phcuzLj7LjMxm2BAGl6YB
s88UnOakAkIHzcx8bD0FM+pvP5vxPqGkc7WinK5QTGZYSIVvuB9H5cX4xR09Xg4gsuBMAJx9afr3
FUwPeXeh2JN5i7z/P5YiIISXp74KaRppMzTJEWhMxSDyvspoF8jQk2g6+LzYz3LmMMyhKm2mPL7l
5GNfxb/R71We9Oh+cQEEQBLAIWLUvYTR1+XI6u+hTYT28N5M/MLcwyuD2Ji/S0Ja7VN9mQsMZr3M
F7vIkgr+TnL4UVoAYq4oJZTCB5JGnQHcOzEXLHsfrdqI7urOReEGgDOYbV7IHadc8ol9VoZmk2DE
MTBmYSrSPaqkbkxg0m0yPu5tSuOvexL1lmPkFqrFkDb+EAOr61I1q5fe7nS9OFua240PT8ThYoXs
wGB9aFTre/A0JHQc4JjehTULc9jcXmhuvzbux0czWXTrlEEdSBncQkzifUzTMWMpHIJB3BYDcrOt
vOt5/8P2OJDJAukCEIdAdpDmvuUnjcbe3AnEy4KBXaVlOKIIG/H49VxDcEISGECW/E+ubRQSB8hU
pUOcwmJwr6IM7Pj03jpIKeptHxczvLwIdEGvxmPybNutkjqKwb+oEoPoHZ8m4sz3nBvPO9zcn6Vz
rSaKIy25UDMEZ1vWoKacnx7bV+SKVr25NQ9kNTijORQLPWM0yyJUGWdQhZrbSE/eBG2oJP7nwfub
5MHSZRMQds8cF+QYiKFKPWUNOz2E43B2ql3xHPYEChdYNCIMVSEWRIFWda7pVE2AiZREbC16Guto
9DR+HvLDNwK0fFakYYmQzygkKZGNEcGCSo0A4qTQixAaMBOYM5VhoC9MakSvyM213JvZ1nrfqH6L
IMcHWvWGkWQJcqXN8F5FQCPiNDTbG0JjSD6uxW2gwA9IzPypiL2frZlak0DaRLIbqiy8mRVGln1F
AOGtEPJlZGCTFQFsYY9DkHyaY1cVC2VL95AFvGGxZLQUmdpDrkri4LjIv3NTvRStpQUlAHQ+I7Zn
J0PG9JrJMjmZqtp4Pn2VVhkQ293mEoCBx1AVoZHDseQc2dNDT4nO6TSSMBKY8cmXODmC0MI5bEpb
bWCVSmXfaYTkajIbpDC9E+bTYBKoqZJzNUI+UEJnpxrkjhRw2m0xs2FVTFqi2mMOiW2DW8wLO6Dm
IgjkEdJGBG5p78dInDpgTAninEnLmY+Qb/eFqDQGbwLIwCNAV0pUSE8kbPUc2hgAqQs2zVfuymZo
l6FkKRx/WttaTNq9BRQ0Pv+XZXexQq/cqjHJumoS07EeyQDwRp6tI84fL7uaYuYA8iIjKNMhYBdi
QX1NJQXfUVhjqBe0gIs2VQOQv0zKdO1BZ+hmDvNUV7LNSQZRA6+K6ryXDeGMYs4NUAx+REKrSQ4X
jajGxWnqEZJFTBfQYa0SIBVCOWrxaO1gfNlrGpINYja5WDLXAA5AkBFNH1tkDMIZDpXfCBYaDz/Q
tS0rkO8u1I13gYPbkkkcckbkjc150dpBStSu0XBeI5tagajUQFFoLyQwgK54IXYwIawuHNIkEJF5
Agg+5IUzKuKZeXl5nagMZGSxkpSZ7dVNRXupIqP3/aSGWyIkE1McBkbmoyJDsIAXZJOIqRjNQUrm
TGiYSFnEbU1ynWqAdVrqKy8u0A1Y3ywyIuRYS1NZwBlhlnFe/vFuHLMkf8NCKVDNBYyADWGGJVME
VlnU0+Q5Afna8VpVq/qpZjC2wApkwGhiijzMVzDefEgeTVzAo0A2CKtp+uKXq4+CJ03FDMtTUq02
b8xUIUKnuixLBhzrPLAGxZJ0yysG01ZhlJvxJMRDBqIWKs9S4XJdKig/H4gj0Bxig+H3DG8odfn5
DUsVGaDRwgkKZf9fq/Vp1UFZscoJhZI3Hg7ndAZtUDVxpaUAnICfK+o3Dx5LWoE2l7lr3sBrMuSA
aC2BE7iNbDxCcQEIykVv1u3n0OAK1edyuDvKb5wjTs0/a+5muZ8HMEgoLJJpYbWBtZhKAN5Q43d4
ne0dVzUfodrc1SMDOgWpg3vQ4TxNZeaiw6i4oRLD0uhCvhvTgU9XUXjZWx10ZnwJKa5TFU57TfQW
CSuekuDMoqdS0VoWiM4bfDBYN0OBtLw3NFJNjOQgUTG49psLRerOOucSYjMbi6i5OwEUk/8XckU4
UJCqAsye



