# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@oracle.com-20110623132622-\
#   dp3k4gy5rx9tzmxn
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 7af05060956288b751c962e524f0538e39fefe6c
# timestamp: 2011-06-23 15:26:27 +0200
# source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@oracle.com-20110622122158-\
#   u8wgxiguf6olu3ar
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWIX1YsADsDfgEAQXOf//34V
zQC////wYBEfPBz3LHZYtq7xJ46Pe6Zru5qd1M7iK6b2aGvdA7ypUlFRT6aqlBJIptDQExGpp6TN
BTIxNqmmgeiPUb0kGmgaJJTyoeoaPU1NGjACMg0aYJhBpk0QU0U/VTI/SRppoAA0AAAASnpITRTU
aRpoGhoADQAAAAbVTUaAZAGmmgAANAAAAEiQmgRpPQjQZTaTT0Jqeo9IaMjRkNNMtxlt65AirEAN
hRiSSwYp1iNsLWCXwiBsbE2kF/zqfM3WWz2GcWf9142r62Be+jTFM0oZRaZpCeWVQpR4UMoooooo
oooooooooooooootKFKBariVVdSVVYdNAKFATxQrfhxVpVDQUqpVDSBQtVkYoqgoIFNKrVCNUlKi
DVHEm/S62GaMxq8Gc4x1yxeTD+r+HSIUVUozAUrHewosSYm8iMgjJEZW5cwFNWHN1txo1Ap9lRCQ
m8zMxHSAIu6k1bcCcLCc5bxQ0ZtqmLpuhAhOdCg0wY2hWukRJuwwbDBorllPMrp55MnRdf6lr+oK
4/fU2QVyZ2HxNY0kJNiTYgQdOQBH5RHfffyeHDbbbbbbbbfWrxAAEBdMnGVZV+0FQUHfTkznic7B
u3QWc64NHYiSiOBdoJEHSMx6x2hOzVdbe3RvbSdPWwmGndm5altS2POSw2XaVMA7ly5ElibuI3bu
QBhYNTWkNSBGIRiExxvGUMyBJAklEkgJKAkgEkAko3AERrFXM6260da2222222223m6BkGhmmMnO
z0AaG6QCKMJICSVJK08NYxJJJJJUkJJOZOodIpl0v06IsnNjSxMGiyh7FPRsuNeyKmNnZcpwKLGc
gYZLAaQ6s5lLXaiwKfdFTs6CapNdpYn2WxOzaNu+vfyp665giLE87AEMw6mVxxtuuzR04VCJw9a1
L026xMJtrpvUBEaMmjJnWdTlKkgdZzams0NTnV4u2qu5eTQmlvYWJui97ArTyFDtJExEvkLGOZhH
CJQKYk6QkVeE7ON7mm2222222227recpcpPQq3oXdTqjmxZEODvJ8mA7jx/78o+Cj9z8tZG6x8Zp
DsvJIciU5pTEAHaBU+ndvLbcdoj1PsOQdxAsBUWUCIm48gIAilvrpLJf+mOw5monIUEF7RABUdS1
ItEwwqhwbBhfwTh7ElLT1Sk52mJ4DDAy0E3z58dZEx68dRCjFD2QbBdQHmH234kgCGMaGDGM5h+7
XRvYGJ2jPHqp7Yb2koQdqJBAeAMKgw0DBdJkWooDBSxOhga1xxNN699o1QdUKfd4npcBqHGVZ4Gz
Tow3dnA2rk6quEwK4SwYE4DWMqHktC05uexF6eQfOXxgqteWd6VW2qLaoygVhDhDhDbW2uEOUOUO
WvC10h0h0Z5zgrpq2uk6ekrjrd9J111YcoAdJVGMQCjSUdIDqoDCy24MMBy3EpkO73q5E3/h9y+h
xZTgbnLcgzulhas7rZdVXAYzfnuZcdzC8JIXwS3u37l6M9miziSkURwcc5usZYi51vPHa71StFK8
LIcNmBxcG+szbrKLosNXlsGlcgNM0AzMMZHxcYHcaGs+ID7QCACDAYMI4dRIUmhJI0D0ZTkxiRay
NN9Kq+zw7vIHj1p0Hl8TwOK8qsjm3SuYjTM7fmOxcLW0GF+GGGGOeigXGxy1/KSOZtkMIZehMhi3
m31pMMnFhle0KUpjNFgSAlOxpSJOwabUMHOkIxz2y/SNLUEcgyR0BDkFATdZ5oDkjFgDMgIiZU7+
ED1BbqFNv6h6ebGhY7Htyoogb0GeIBaAILN4elfmqLQmYOafuHjR7tJiyCMKZhGUUFEqIW99KZ7+
GBEvKmNygIkgqNGJKPN5CHg5kON03Rw1VG0ouXZSlRikaSZU5jdOfeC8S1AlqZc228Hg5ZwIUNiW
ZvUBHc1LuPIeAj25lQrN1HJzyt9mddGYs2FdzU2/AEAKqIjbKlzZth6gMiBDBizO0V0JQdHHdYI8
iGqSu8SUlYaBErUkDLgDJMNDQzsCQEnEHrOp03bYACzNFkrpM74sOWhTclbSPV440OkuaD2UNCYx
KLQiZ8HM57tmg3IRECMoWu9s654Y6YUecxcqPVMZ4z1neBbKBDIUdeglosSCGESghm2aMz1ZyMTa
CcVFc1ewtaJOHWPG+O2kweqw+X4rnOFmT0diZvIuRmcOrWJfogdqOdGsNIn2sMgmFdN1+nGox6pR
JoJNNSiZlWk0UwqBKTRDSMDRaTmIo0VAaIaCN3jBSqVyJbR488Y8V+h25NxPTSuMRaZCHdO97d/a
wzqViEL7ZzovZopRTT2m8GLJbEpVVO7bAQy6skU2CPXAHvsh7QDe8AM6HH4wGzEIgdDkOuKtVjjF
zd31t4uUKkyuVrLaq0qVXWTuread2BoEAjYHgYyZxJoGJJLm9uzdkJTNbc0SxO3eLnZdXVKpMq8j
pIscndNHJyXL64IViILnmXU6PXYjir2x5AD02OzaSQB3PaO/LHXWd6iHyIPfKias5KiKh9STyqzU
h59PNVDYyovy6gAyf4mp9I0GYjtz0CaI0l6AVpi57Sh4wtUGF2SflM8VfiokVHEeTHV4RCivQNSh
QFbsuncsUo71WS5APB5j0e6B8AB0cOzLFrBtiQaXq0PZnSIz5ra1zvuuuuoSslZbc7qVrc3d3bi1
tTGRmwk4Wm7xDZvRxVtjasA+sIiS+QuUKogxU9S9AwQA7MFGwOHMNcVjOdLWJMpJSJEzCXd1tawF
L4eCK6qadtapnuc5me/DAKw7uEkpEtXPXrIkNNgzrHVUOL2hS+3C9qbkPEeWvkuuGn1RVUpvcnYl
DzvYHVjRLucNHg3pUJVe2qBpw+OHJPJfKLhUIgV2V1QmlvCoxRk+Ua4zVX4JHvyBwH5tSdcqgYyU
QB47UvCQc5fiUe8Sktzd3TW1kyk97ezeLN2ZqdTlTdPtxqi5w5hVwMp21J7VynJKIcy4GEFVACeJ
l8dY42s3U9uSR4fkBuczNWoNaPFu2wJuw8C8i9fS3XA6Mlh6D39z4hisxMTbKczgqKb7FBma+19L
5X6ZmfCRz7r4xlnfBxpjYQNVy4laYiJq6y4hynrlzatSpsTbDZu7jmzAIJrPGCsaveNnjJRvRu4r
WXbUgitUHp0JggkPvNNEAkEqrvLq9qB5jOO28I44JW1HyHuAebwnHaBrnruc9HguohxYPDmt0cbf
jO3kVUURFUFFVVUUUVVVVVVVVVVVVVVVVUUZCIr6kIqotKNwiqqqqoooorcIi0qqqqqqKKKKKKLS
iIqC6kZjA4TDYS7oOSwSKN9o7U5mxHLP9zdyIAp2IszMzfft0L7ppPYiS9CKfUhGkDwN4FxLM5xS
RQZ8dbcywUyPTlQC0U2egTDgMnuPvRBUkPfO1Cwvjj6eglyCzy8jVPBH18z57x51GBWFkO8YCZsd
lc1WSuQcgLsaFwj1BU9R7EDrkq6Nx+UjoLTfJB6GmcLsEHnnCrUAcnrtQJAcAi9EnQoz+hmIrPpu
NPCLXDhLptErri1hAB8WSSQ49wGHC9WI4JCEm5nidRTOaJFmgyDsKhFxRGRAHgdFBL8DF5E7ahAB
8irsNpD9u9fCRIANHeJ4F5fu1nqYPmA23e2Dc0Lkgij5WdwULioJfKOw8iNZ1Fdx5GoFwM6RGJii
ZBpwQdBjbTMhoQJW2+6BoAuM/g19NboWUlxL0kyGm3Mf4xbsaGYFa80wQkLlsdnO5gTtoB2b8tso
maiQeZFmhFxBGIiG84LoOciCCAgIAgIDce/zh85111qhIoNebgszUuGXsczcS6nHmXvZg9JxO8xg
KqV3q0DMRbrGcL8TgVjxZFnu61CzJCm9IQlIc8N5fonzrQz5V4rYFRrFECGsa5UC8eKOQE2mXngO
eCnSQefDdOiECViGs+ZEZnE3SMPdtLh8l7OshJJFZN5Ashb6m8AMgpQq0iCLIGxcbRGH50hFE4CY
gAe8++g4IWAlMFIJFH0mBkayMxE39DMiZqMsVIAaFmezjnPUBxVTdIOuk5rX5eYErzgVu7oNLEAE
hgApp30BUFBMn5jHgNAVGI6uRyHgev2GY1mhB4JIEsQJY09SwU8QNViSBLER6QrAXbei1yBMaStU
EAoTYVEQuWry9hsGkuO8paQf5+IK5izOpbjcNJmXcTAJyEILDAEgYOida5/UE8WdtUhkRdpwEdZ+
zxEW0H3i6qHfwJgU2MYMmqFBAKMd/jYNhWI9oKq7yRIlxxCTWAI8nE4H6DLUDAOooipZ6gJ1svw8
SF5LMJVE7wNIDniGTQF2TzMLOl+8pPr2+GQDwvbz2XAsBEKypYLoMRQ8/MoKkL+nIqjQ5JJGarsR
gMtCrdaiwiLDZIZGTDYCYi4RnBr8XAMaFMgi/ECIyAnKTc6B5BMSkok4JEHcRhOV6fWsxqpj2FCS
Gy7HHRnrIv01GCBKpYevxL1UEy1EBbZARUZQ+wHdmaU12QHAGC+CxKYCOUtAFwh2oqOImNHTll3E
iFQt/EuII+WLenxqJCK3mSrk+YsSZqu44HzBBtAz3LgagNSO/Ou8YiYhlQJkBvqrtFMT2LUBfq/8
XckU4UJBiF9WLA==


