# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100709230024-33ewzyn4cxqcsjky
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   55087/
# testament_sha1: 307a907010efa2546b97ce46d3c01df652dfece7
# timestamp: 2010-07-09 17:00:32 -0600
# base_revision_id: davi.arnaut@sun.com-20100708212008-\
#   8gnxr1j1ojflc34z
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVgHEggAGVj/gFEwAcp7d///
fy/e5L////pgIJ30KJObfZcdBKa5QZeae7o5mLzT262b1zdnJz2aCgBQAoXcDwFmQw2OtLNIVoMy
ZrNnWlIWzIkg7YpNd1MRK4JIkZBNMRPJoaU9NNSeRNqbKDTTRoA000AaACVMASICmp6JqJgAaACG
EYAAAE0xzCaMjQ0MhhGhkNNGgAxGTIBhAMAk0kQRVNlGg8oBoBkAAAAAAA0AiUIKPITRoxKn6aPV
T2KTPVP1T1P1J6aIyGmIPSekMT9KeoIkhBABU8KPU9MkaaYnpGk1Bmo0NAAaPUDR69CHklQkGBwf
LQUoMZ+gQpAZ8JlA0GSngQUyIEH5+6aeR5euevSWs+3VN03yRRVgo+aVJUKIVqiotaMtpUWWlv4x
VtYKKKrq1Vdxov9aKNrapba1krBVimIltaqCIqxVWCgo2qH8/2/qnn0e6+zfb9v3OczwHUQzirvE
YFAQuQhRf3QSRH+CRghDcnq/yrKSQ9yFklhxDcFVVqqiHqBoZBg8oIZD+0NAWGqqoiqrBh5hYbg4
rBgwYKwYaO4d58Z3nOGOEO7lKJG/xynYZ2k69tbL5nWSI6wQMprFBeu6iQkJBV1ghndLYkPA1XzN
qjfed88ccatw14E668rGKwYQ6SBqmCKvCdK533zm9nR07M0J2nT08peS6yMzNaWE0qpEY5JEqjJq
5qHQQ4aN5lQlSiIzMju21xnlHREddG7x7Rd7oPHh0VFRebFa8qVOrAMBAMkzEiUCeoVEyEWCQFkk
BSRGIhCCIjAAREgwhCEIqsvV+8SIXVFOj38uMF8yQELf5r5sCFB+8oLAlgMFxuuosdT6YqPoD6ge
oMACQRZCQZACSQZFJFCRUJFJAJBTS6bvwBFOnbs2t8PWIj3ty6+93VbV4+GRclrdZbYfIfibGJTh
C+F0yBtHuW4lRkLKi30YjKpSYgy0ypOKMq0nz01aXSy66LQd2bTpkLrG224z/gByIV0F6vPN4eHQ
8O004nCcOk1unjLeLMdpjBk1GIvThSEdGTdya1lLrW4ayKu6VprbFNuppmSpqqmnwl5mXdxr3vNv
VubhVRsyamXS7fdOiJdGYuEoW+Du7u/G90RjIor7caNUgjw85JnGioyeMV3uXx8qHuH3L024x0Fy
CkjcmJlqQkpqU2+M9PV3Vj2RktNmVkbC4nXjYWcPjd4e/FmM3qmk1u1LxnjQceL4ZjA8cXE27YHP
VF6fHihnTQxLacI98GCpJSmUuphXEITECURKtSllmRE1BlsQy7Zzq5vvnjDZei73TTtp22cvLymM
71Z2nCa6unaYnYjvWbTadJnbwc72P9PVCe9JPz2dChUinOPsApRVecCzxGRUT8SBZANGjCTRsSNI
bmzZhDZtKTcDZswS5iGYiWDGJKEvAeuiugJBNv2h3zf4+GqTK6Vj9Ml53H+rI0B1vkmw5puS/++e
iYMENwqE8w+4XQaIgdca0w6pCqMAYaUlAwcgSiiYieyqSRfX8OaW17oSEkkrpxyTkNXvptsaRNwJ
meSWQ1TKRSEKTWUEXUChcrfXsriAXQ5CUJyE5Jg09/GgyIJxTG8LD7AZtunSskzTYlAYW4ZQCQho
mSbMabDYDQ2wJxpOW5KTwUCLgjjhkmhLm0z/eFjNOldqXqLgDoSt4bwgQIHGQoECBAgQHSJm4TFJ
oAc0dddE38duE3gXsnSJt2pE35zGogZuuo1omBbArRohn1ceHKZ+fOebkc+2ymVDVTBOwe1xmenE
rc/xiDN15AvaeDosqlk2qqfADw/Swc0krMnQkAgpE8D+3XrfiH+hA4HIFN5tKhY/mg5RAjzAwLuG
BakAHn5gnBdfZZhUkGSRAB2ISICRDcTP3iJq7y5iMZE66ooLBHKh/vP07/0sN8ZhhlcdT9Woaj9W
1O3bsUbhUlVEl5kc+BLkN26irWwh8gKDcFvwTrA/XFBsVzEiK2QXgkRDnEgg69ftpo7KUhjzlo7L
VrJ8/Irt9NQymk0nH5rWR0oHB3FK1kb/mAiXU6zsHwT3ehwT3Da8Mo0HUw3hpnb455ZvJhIwhDBn
w42TtIm0g8iMSAPGUEWSRQagcpQyCJe+dA6KxkLcHaAcjtZFaMhVh8Pl0SCCBEZGAJMeQAn7WPLM
4y7gDsRhfUlCIQSDAIkBiQiQDNNxZaEkhJJIlNxCBZZoHAA339KvNdt/Xp8SwY/HfWSbk4JtS9Y+
FJYMJlVuJxo8EiWLpqmXenlv7EA+ZNXLNhoc0uUkADE2whR19TD79mRVVVdg/AVfe+aRUa7UoHhv
tqDF2+E1viO/qpyZAMvnVTqsIGERwlIKFIXS+F0M1vh72SodMOXXOZDtKlveHd460Spp5YVxA6QD
lhJ6nb0gobQMYeEDSDnAbQNKAyBYqmEkANTK924A6E9kAyphGcDmbTntPPmqG5JwEnO3lx1uwrMT
q3ktkaXSlp4ScAHrMONdc8UhAQHqIUnyxDi7UataAQdH/u3MCw2+kaH2HmarZzkm4crW023ALZAv
EpwWsYFu8DpxGRgd3sxOUzPLbHQV0ZnzgGZcYD0dTwsOKWRDnFUCoiSCcuBW6Af+iSC1Xdjuvl29
uxaWtzadqpbhiFedtDZdskHBofb9zXiNaPi0DHI05YnRVbBCRUI5kOiDQiEIsI6CKl0rA4G7hZLF
/ISh80cYXJMghkMDVfNWwnSWiO3dmAWcVt6bMAUcU2bBvIkgVjD0OFrQZQ17sZ99TXFUuDkcpW22
TpJlP0OzQZkKCBeFFmgpjw5dNDDjkLnR8uyrMNRjIMUfF69D0m6OiNoU5UbSGup1Wb8813ltjuzs
wqr+4PVNaFngsGStsZ/48bdj6dHy9a0yzJb+zpNNkThsGmNyGyBZgnAJzEvIkDoPGKBmZlxeaDzX
mxO9XsTSchwgvTF6okioTjMuV28jzqsNE+6Kt/f6OsJO04RIVlp3qTbQjurmKQ+Niw2DRs0b59uw
J1rUa6Lj7xm5TRgGkTWkIuYamw2ltUvWWtB4wMiO3XbrMK4NSFlZgkyIYLdxupG+CwLbsMqurEeV
NqtoGtMaZgpPeoprhdD4IPq4haYavf0XCiy9tiMrhgiIiIJ8z3EnRyK7xnPWRyg82r2AfCailyRk
2Kkkm1ByZmZj8AAuXQS4GAxpuqLSfaGqRNSZG3HBBjpdIpQoOhtc6dtEYPTPKMZ5rNt9B10i56da
vL3xvKOuvPmTOHQSZ3APQ0U8+q8dcxuLkRNSu3V05Pg9rv2TXoWIdw1roTBx4f/sItJ9wuz00eO0
hHguFSohNbEXhX9gt61roeSU+6KjPRTLSTYAGow6YlppLqiayDXNEZOXlhA7JML2eo+CMsSwDg9p
6HOzk7jnk8gpJ0LMDWu5tT5oe3nz2NblRW0CnhVa1GbPMyzFTMO3iIxe+O83CQsW1ZNRLXKGNaZO
cb1oC8Bb0gnrzyIxrXIopxSwmrFm6N1Zy8pWJKlQIc9Tx4M1N3zxuPgo5mUSO3q+yo2hVKNrWYbG
O18wkExFnC89N5qoNNpbVUXmgfe2KExYdBUYADH0w1ryQTwca5ED/W9Hpe2O4d1BmGZA3D68elsH
F5PNY2PEYt1D2kItiF3Nbt3xqZbZMgdEm9quSt8jDSUJsnFaE86NlmxHWGg9idiHkLOtquyXPJs7
GPfRbQePPomc1Kh2PApiN1Sez9j6x2tOykcXkgDwnngU6CDng7NxwzdhxdTsXqUbMKY5ODD3lAHU
Q4E8n2e1YovHSUOs98bqvM05ztVjGen3KUite0lHp3iBVSKHvg75HPLb4d35USDg7nE0m1gPdwxt
zajDja1qjo7mk0fHnpPEHoJYmHcvjMJ7CatOberjkUtjogQcDLCQkaVW4vOiVrqdhABbED1UqjRo
rkqxnbdvcgNymmpmYndayg1Q17C28SoLBhznnqdAByyRMFhT1j7BqPHYk5deqp6I8+zjpfjbti7f
GyZhZZ0SsfU2VFtaQ8O8Ylumrl7ydljim++9aA7epLZuzAQOQZeiy/Q5tq5TYBcdERHyhSR5wej1
Q2zzTHcJAOw/Sjm54QwdOtvUxroiJrDDmqEhXELdzsJokPZPU1qVPQaBiw5ZdfIfk6djt7u6yrre
99INrMtaWloiEJMXUxC7FzFunLh8e1tqzM3k6INAkL2NEACOIWXsXbhUghIylq+hCURD/R4cyZnW
IWQLA6mM8CCvrlEK5dRX1ptZddHhCxdcGGcLxnFJtaTTJDVO41sQ1mpvhnIYlQtlexUbqCg3FRQY
7bi8kXkSooNaLEleL55am8+zxXIqeVTVS7zwm7iom6MuCiu0sKiQKsWZeVmP5AONViPuoIiohySS
wBN+07jc+6eWfq4a1hByMMwkbE0glADcwOaHGPnsxwX0467SvYbOgzm+duUIa4E18OxbIO4vGQkp
zt/BpHJxjrtKaCZLBkQkEiuUooqLjQPlrGt0ETB9/Xra+hSdkOV+XBLheWSbOU05Bo5lXRmUJHl4
hOJJzvm9SGvsnoP/EsKrFEYixiwRViqIDBRVgKiqqwVRiiiltFlQLFWFB9J6Wgn09lp68JvPnBkP
aho4Tew5CcQQNbFmGznN5zDjTOCdAIB7m4Kgqqvf2oT1/lA1CQPgccnbitAZVWtGHQTMVRRkkkkj
MAOHaDw7YirvNxsUwTh4B6FWosNSePwVZo9iJ70+hpj/ChuroNjUJAIJJKW+TA/JRzEvxUMxakW5
PLJ/OEoUKeQDotn9Ze+QF79ZVCAJkAn5aD7UOUXkivF5AJrTJNIIiYqfcOqInPpVqe0BPeUgPJyy
SR+FipWSYIYubZCbr1MDcmYuajimIFGtgMaKAfjA2MUPKB5Qqw/AkiRAYsn+v2UkDST/ezMAih7t
uRFgTEESVIQoxC8QDeiePEp6pELcWvoBESBkr3Jz76Oy0qsUd6GLZJ9JATzF80K2S3UhQfhkhK4m
x2f6H1p6UiexPUnG60gQBMgIhRdUF/4saoQbelKNi/3D9w/kkJb0P1GxD9330WLYWwhGFF+SJZJZ
x/aJMkT8wMkQKQKGhKUP1XEz0CMmyFQiRluhLKf3xE2CWKA6ap+xC6XHsTRKuhcGUtgLmFsCUlkh
aWtG0MywxWBMVxURRVFVWCGBgYFblxzLDBMMKYJhhY5mGZmUSmFMd73vWne971pzL7yEs4DcmBBj
DNQDRwUmb4zMzByltLaG4GyRnsKMkIQgQn98QL0sYo1BYxKwQcwcQtQHAJooJdC6RTVM0uWha173
FAih+awiaJmRXDGi9CcmwmqAMBKLiBgzDWaw6sBwCU5ieo3rVYIbAZGaCKT6CbSIXqPQfKefUAbC
konPqHMYk56jdbUOf5bjQ9o8xQ3mpsOmoHer4diryFV8WBxKiG2K3iff/tTzia4+5AOrTaYrkoXi
BR0umE7QLjbwScko6wShPZkgFjCRuo7k1V0TG1OLtddVSfMgaAOkVATZaiFYEE3QWUojyBqTHFJn
7eXp0XsANxIaz2ED2DGs4m2Qw5HgTDlI5+tfI8BIA0FhSXSKSfiJZAaygVp+aScSD6xR/qv1slA4
8l8CQK+P/CWS8SfQdOlBEyQDxbAHgcSjBcY27CRI6kOQMT1xmJHDaUm8gQOw8RxAJhwCYvBE9x4s
hVrO8Aa67iYiiAWkb3GSsENgB29fO6vM6nDhp381fc2TqBrATEBVHH0l1XANh6KJphSx+gURhSQC
JAH+CVRAHlNqJ6wXkIDsSCdoLS8CG8ShPCRSSohULUd1AUJDvI4A+Y8x7zpseneeDcNQOVn7cToH
Jy24vDQb9usSzKzx6S41i+WcOBgowb8doyBxQaSpFAIgEEhACLGF5gcob0DSnWFxqLzF3AGJeOwf
nDnAPMrlccjiCcD1ptgmE8UTmOoBh4Gp8EfqyPzm3eG5N3L7jxuupZaf9PPHuiTESA926yZuEgOH
NM0i4vlQFaJczS11h9WemifDVNDSkiUlzFGlKLmmmqUnWAYB+ECEyFPnS1IWWJEgIESJUBOhSRJ0
q5kQUAQurApGKn6dxkcTMgcY5kuqJjB2MXg1hh0hQcyGqJtImeAkBgY7kOCd0qAagd4NNxzxSYCO
cRYrALhYiDJJIAJeS8Ucjm1mQqvNbsKgOovNZYTlOAmRr4BSi7urM+QIzNhn4bDdsa6AIjvHMBK0
SvSW/zYYtt7XNiNy3izS3i2CgWBBDAt1fU0L9ah9HyXqkQyTrE0siJQk1tQuogxMJl34oS6KFywu
YlhQTaKFyWAov1TtC8MrhLUEHSFZDBE1X1k80AaOSugdvkC5IBowhCQQTocASo6tPQCGAN9ABwH3
m04T0HSTE5EgR0qKAKSqkvApOkoNABndI0lZUaDgQJxkLhaMgDjDagcafEnwBop4QkkGsELmjH0g
0DZIiQGKQf6wICUoD94JRQJDiTxsJ+ieN0TvAh7/JRtCrJdU+6eSvAX6QRElisku/iSemlkC2klp
YBbS1RSNUSGe8FwidXsTQT5D9UHyg+0rtEcqP2wGqetMBC4yKH2JFH0bMQKjemCiJEib1eKthVfc
PQVR3CDeKB9yRwQeI9nNuEGuP2qP4+CDqDqlvrQ17EewLnuuT3MRiEBRDdsExAeccAh6xcwfJWxw
DamwgnZrrx+XHafv2oeYsBfs8/BPd5cMuYHEEOMBkQiP4Hgie1XY5pIRIkE7uZXaL5tQnSM5z9lt
+2VMdQu/u8E7uCcFbwXeGig+HxKalJgBACk65vgKo/odzIh3xKD1KxXuQPl8wLs3qSbFfmH4w5Vb
qBdYkA8U84nUJyMTYrgnSmlIrGRiEIgndkq0iWikgIkgAwGCqREYrGDAigIJCHJE8/bzQCwcycol
b56YZ7b/QBID2lAoBiRAekIkGLVaoQCIoeqih/JR/xBbIIP2AmoJyNQnQGhvdQ3rvET+PfX5DvFw
oUFKfkq0UCQBgkE7n4Aew9D50YDTwhZ0AcYgcS4pUJE3Cva2wreTvhpxW0uRsJROfCAyOkChvgVC
CRYkBd6Uph9CVNeuElDMciZpEWJQWoW9IDyWdgLETiM6CdrnzJiA8UDCZobRdoOxNiFojZWAjBhU
KQJnVCSCRqFASljvgDUSoaANwZWFPpuAqQBgMEgl8BbJUCwnqVs1WC/JFDaPA0/Eyeae30W28Cg8
LAdXzQUXAeY29A3oG871H0SwHRXfoCm0BCAoX9/x3gJ6BcfimQpwsqbxkVIEQqjYCc0TyVYgHwTO
6lW9iw+R4wnjs0/cJQhxNToZCFBsuHlXDCcFo8fZQMF9+SP1gkgD1MkKKVz5A51tiJe6ghDrkIqS
V/xi9y2dA4wExSigTihISZmxE1ec6FfWC+YA3ByTsBhANRi1Q0kAiANCfXSKGSRBS6JAAHxKAAwh
+I0lXFCCBoCaCXsUkSJH6hVc1DkmafYtIkzUL1Hm8bI3iOz0ImalRME0uV/dUB9advarzUNFddmi
ABQg/a7AN8T0GqIkRiQEPilVmuiR2a+pKAvFskAPRkHb0pTfVp6+Mb+9L7qJSl6pxdi202lwpygU
38ggxHtoLWG0VTUlOyyf15VbA1N4JegVwjFgxRzAJAh1doBO9449SJwSLFV3rvgtBaIeiA0UiFIP
jEIzCCE3IUYsJq2pJKxWIkgHtB28xbiHarhQ0CwZFFFEGFDRRBoQpSlEKJSlKJEpSiBPYgefXHM8
XyPKE2Ly7RAYngDsALkRDhEteqpAq6etPpweg2EzEz6Jg0B9gDyQBwgcaa06GiDgI96QERMRLxEQ
xgo1ql2CUTE6bhaiHS1uyFUgD38VNyRBNI7qDmJBgqN3pga6gm44GNwkirO1KQ4q6pskjkickAu9
ClCiIi6qdtWTdBdptE2Am0PwV4eWgKPMH4p/R7ugu/6qBKUc0OK3TkY8cA9n2F6oK4TTMLCbxPpU
Lly8eZPUKpszBXvIqfUGfy2w4k5BBomkGcFevXqRtHzideDix0iW4gvHmOSCnC+ZFE8kgnlBPyGI
AUeYLySqjcm9Oc4+tIlzB6hlkaqFLFUpFgJvJ1glggzBGW8AqXPbeYel2TCTN4ibT3i7wS7AEf+L
uSKcKEgsA4kEAA==


