# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100716010308-1jzrudthkgb20m6e
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   cleanup/
# testament_sha1: 4ffac7d24d43221521e5db8dc526d65c2ad38031
# timestamp: 2010-07-15 19:03:11 -0600
# base_revision_id: marc.alff@oracle.com-20100716005039-\
#   xq2skix202jenslo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRqfSssAB8PfgFwQW3///3/H
3uu////6YA8fe5nr3bYetO6u0g61lNA58i99PlIviyn1lNjppdtB9aDiYSSCATJgk2mhNJ6ZU9T9
JqPU08oBk0AAAAlE0CYhoQI0Ej1PRNDTTQAAA0DRoaBpKeU0aBkBoANAAAAGgAaNAAJNSQmjTRNR
6U/SnlGTTRo2poaNM1Dyj1HlAPUAAbURE0j1PKAaGgNA0AAGnqAAAZACREI0mgIyaA0KeptAk8JD
Q0aNNB6g0A9SohVYADXafNNDOfh+Mbzx6DVf53jLneLhpsbFFx7uXLxdh4bLli6upg5ZyxuwFVVr
DisCP7Wy7MaPMCgtescS9U3SAsb2RVYEkTTt74QUhLg9FKv+nhqiTjtsJ+7GtelRuLpvexmtVAVz
b9ynpVjTutjfcQbKbOop1ej06uzFKo0AXmYu8arzhKmPpo6EzAt8V0GWJwpsz5avx59L5kkJGQwS
QwQEEREq4a8sxwu8Tst45k3IIzKGrwby1Evqhzgxztjq8FKBTqnqBRbzrchhxMCOjzKda/t4NA2I
XR1cCAOgXf5c+x08IMPx7ZJbJlFcOmEkCiaWhjmaPcpVL+IH2VCW/XmdA+pZMVslSCIxlnHuvB8X
b1TrUbIdzFisldR0l52Xb/GCXnGvO974FcOXTRN2o8LFFS5WabeJy5HX0OOTOMWx5cORmekik0pa
MPOuI611W7hKzvAvt4RkfQI/m87ip5L5minSWhNJuyVHejwQrfXPCDycB9zteR3vwPV0PaBzqWVN
/Cp8fnXTSmkVktbPr24SU0ngehT09u9rLqC4rwXNZsdZIlwStJjs2YZ2UtIwi0sBkiR5zEbyUaGb
Synoy2kx/b9erax5ie1CjZLi0BZ9z4VlHdzXbHg73RE0XXVjrCu8W0L6K3dVYkooeCp00bStY8HE
BZm1/Mk3wcLv9fsJvguyR3Yr1u3NZOdeWc+VtrF2svc1kSDiAMJhU5GuYhbJCGSddcFpXOVmF2YJ
iJF2Mlq6TNpbKd++j7dEacqjWxMzQR9KJcyZ85KvCFORexEhIwZw53ZrU0UyyliJMVE8Q2eo8oqv
emLvHU5MS22hig7gc/t9Hr9TfntsQpyX+vDt6UqZ1IpNvqlp5eB3xIhElpzDPV64qSsD68aLQeIo
hgQPsFOZsw+ua/T8eBEb6Rgp+MCw1+/PdQ22VVVZPdolEtD5Lex84eQQ38dFH0r0lchqoFcwkV3n
SJphYVco8zXq7tu0YiNMtsxTQVRg6DnvLBWKOZhv4Vmc84H5XsbUG9DBjzWgZGoQ49CmHDFAA4v4
2ej1IL6/Nvepjg87l4DzO11HPqydLnk+Ls4Dj5eZsGz4lb9iS2UqwsSTCpfemHgLiI7jxPEjXA1X
fkt41t8+W7tOsyPsaCWlZoIawYWYddsYn/FiYQyZtxKCLtppLAhpCYiqCZQUsU9dFURNVdd0hnUg
AzEU06kGGnyV0XWkDWIqaKLw1JFiWCYwMs4RTVNaSOtfrXmTS/xeJMIF+ViNR2GHd7jBatJignef
fjfNBaMt2FeXHM6eTstxCrQHYqGjxrIYoHfedeUmQuoi+gjcfRb6DDx24ZOLrDqcGS2KA7AtBDGK
h9SDPLt793AoEaaRLFt9v8VxfdshKdcKB4MgWCC5RETV4ExfnMVyMpklB2sgucSxLMKZ7Xnwo/bi
ttoISEeUJsZFTE6Ggn/f6kr0RJVtpCL97Qe+2MYPVnWEGdHOoywemBTUWMyjdR6xOh2unVJisYRp
Xi67KwpNOUrZRBMgXOJgqVhlo73bBBCMKssOea3Dl2aUMxabGb642debXIq7N5DweYwJRRya0ox+
C1gHNo7uLYCpiu1iSjSVDebjfLecypLChuvhTB6ShWVoJRw6ZTPcFjnX2msfLC+KLDUcEGK6VPCg
UIvzFhq5xiYjnbCJmw2EGbUx6DdeUVYli7XVBsypciMSxsd87WoSwuCQgyuLinFR4/HA5ZkTCs2d
R20YaVrhnFyBlKOBXRY1i/R7D1gkdrDiHB8lgYaUCM5C5ChDKfgu9c8kys46uN8e6hqik7ocaPhu
XdkvHCKC5vCVGQWawCIk4r92WflJs4GUMlCiiYQ5yR74eWMSJEAmsW29/aqD9s6Pwkw08/KQ80za
pNlenPRsZt3ee6XdWGK0WLW1WhsJpvv052spdrEds8AUqurxeme/j135vuSTXf9h3F/9wKi64Mop
JRKclMzDJvMH9IrUw78uiIoU0AvCKpwSUiPoGXSIvCHMFJKd+eQmlERUowuhAwL5KAQ6/1i2whN0
nbCbcy6VJrIJ+8gGiTikzNMJkXZVSh0SJm21AGMJYnZyhBSqoqeP+mdPnKWdjKZuPaKhYj+xJ/Ml
4CmLQiJbzdvueEIOoKmquW0ig2ZCUrIryIghkSgpvUqTMklRYlsJYmKEh/yoIosUIagEEklkHIG2
IK5BB0wBnCrAYVDYIY37XoLiZfCQAwEsFiw5hx0SOouncu9JVN3f0aKUboQfNK5cNVqpg+mEhE3t
UQ0CKf5qa6t/hzfZdJUMBo50i2nwBQFRFqM0qofCJkJToPVAcIKp5U7aRvtwI6ESDppVhORhEBF0
6FcyMs+san8hDZGv7zqYzP7rEsXNYSzWMaaLi+cfYwPlflxovtD4tJLnoXeY7uSeMQSWkyMTEwMF
Oc9Nj+TmEkOd2kHE/cc19w47DKsbvmpItUF1MajMkcDhBsmiVoBl1tbBiNOWKiNDMaNuNEKPpikx
SE97qVK1isEsGZoIXVr6SVxGcGfAZnUujFHIjHOyUw3gKIbqbCTd1lTdvu/+f1L0E7XA9vsCksGh
B3yUCKDh4Gpa9mxZJY9B0DoVkRxDv6SzE8i2udIwpFglHJ0wvKUMYyf43HjhFqq5bKpNpuuGSWVE
U0thWznNmIE0vq/vL9T1ceGNu3DbO6KqXSMlIK7JEyEULpBRNmV2ugvThLaNG04g85ciUgKilxIp
u8XDz1TiNXHJrvGk22MY+2FEMH3Frdn1ONOR/nhxzghthuw3uXzWvvGG4WChHceGyvhm1x0kRqpX
GOFC06PruuNFVTEle2NeuKnjJz52JS2D2MW20JYm0BonECEuk9Csp0A8ZMwcNp+fYcFLxO6hJWBO
eITei6QS3AGsPu4IhqxHu+S3rSl7cjaT8BfhiCny7OyUsJg+DPASJXYTR2NbS2v2CMINyWVbARhm
olZEYLwzOeWiPFLIUe2BqsS//mwh9wxGKxm60jAH8JhBBARVqjEYjSuFfSgfFAHFGrzlNeql+0e5
ObLZURwxDy1pVabEQqqgell1oo93QGgJsWsQD6F5lERkSseXAVrxkTlK6qp77NGGFm4W2vU2Llk0
gnqaPDpeGzStjaNMdXMCLpcAa02F2XwkbIDSZE8N4AxrR31iyld7KtGar33oFQJijzV70HQRfiDM
i28RmKRRI8qJ2R+6etwSig4OTIPATIgWnJ5HWVGSIUqCtVhOzKSWL/GTgZwrswO6DTSEzitGHaLY
rFOnFWpBiiWa6CnT2b5N+LQ3i02JKfUIgMRpeOf0/pJmZIJmSEyJJa8xk0byDZ4+QfI+QNR50Udo
gyFmKImhknXcNuhsFO6IExJOIBd3sQkWHIkZYkAxmBqHGLhUG2KFKWZIko+P0ylagPC6iixqQIgU
BiQBaiEEI01pp038RYAWHiYK2NwGkvMLsTtYdya79UZpRkrGlkBpSmMYmNMGipMp8u1d/1QG9l+U
VdWHXRZsDwI55Xq1INZ95Y9oV8tfs2TRKwyrSMwBiGDErO/km0ZLE6NhfYl/PppO04yWXxj1yRJb
eOcFg5UwXtNIH23ZeJ+BhfRlKzuG5tEjHJyZDHMQmeugcrXuetaH4+xhHSxsbgXlXjt1Hvndp1Hb
Y9zN+3mtPNRvwdh6JqlrE43NpTRRRZptBBkedkf0KIR7Dy06WNgz3jbUIR2l9wgzQHBrJttlOd9x
wbYUqzTc1mjO9kGVCjRTKA3uOHCQqjF37ukqY8h6ww0od4tex9BlHpxxEDXMCMpydHNz0iGUVzQE
VW+51oGYDYML+GFaFTRSaxSTysJS6YztmWbK0ZAqwQkmLJKc50vop0Oj+RYQ6HRBwmL6ilmVM9MK
xaYLEyoTo5ZqqpkKQJYAz7UHvW5HRpVebODnUbAODSn1JCzNEbnvVwtIkVgIxioiiKuNrKEdEbMs
VzCzqKvXjcXrMI513j08Y9ujTMQ9jnTDaWEzWiCjIHtnDDASwAwwyKQ3I/RftQZaFgNii1ZAWMrB
CqdJsCyRhoK6IIwrMvoljpdVMEsRaMQ8UyRHBi1yIhcRGohF9VoBzzEStGjMUaowBNwM3KEpFySg
T9xEs7TWLUSOopqmQ7GNI4XWaCCTbaI30FLCGF9O/mB4NQBrGQeWJp1q07K+pHRmNQ4kLSkhDeBP
J1KSw9j9VKUK6pbWDXMzQHdViq7pIkUuM0GkbSX9r0TslkgeYrELIRdC+5BmuzOiKoaENlO5SAbq
An2rRDmTRDRLmZaid5xpwXd1cPRXVdiA08wjGBw3zjKKBQUpa/8XckU4UJAan0rL


