# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@sun.com-20091103222442-\
#   xxtwlivpnerk2k5a
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-46364/mysql-5.1-bugteam/
# testament_sha1: 95c1fa7755b3eef90e34f0650e73039b2c46b78f
# timestamp: 2009-11-03 22:24:52 +0000
# base_revision_id: azundris@mysql.com-20091102081313-8lw7ickxfzgkuq72
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXeu0vUAKG3/gHHyQAD99///
f+//4P////5gJP98Y+OhSpEUKIdi+zVPtrvvHh8F8wpZQ2zMWcgOvpoFANAd2AepjSLBtCimsUQU
ApIlJJBCgK0GoqKoRMBmWg1QNEIT0keTQn6o8k9RpkPTUMh+qAAAA0BoPUA0GpgCkT1QyaZ6iADI
aAwjIAyAyaaaMgMmCVPRUj1M9RpA0YgGhoAANNAAAAAAASeqkkgKn5J5NNR5TSPRqPaJoNGhAaDI
AYaATBMIpEAjJk0IxCZGo9NBqnintKZMjJp6maaQGRoGnpAqSECAgATRlTwjTSYkNTYRqYnqNknl
GyQBp5JveNNoSwBaEo93+sB+yJFIQ6hUedQRgEhFIFVopOkPeCSA6CCkVGxU/EVPeqTVBYVOsEpE
minuD7QkKrqUQ6/l8NERMnH4QyIKCJRRK/P7u28yh0PnUDLzaQMYXXkgKv3avl544oiyw2zrITCq
n/QW45RgkotWwhKBKqmxKcVsmFtICudlx6rXLsMiEBkQQVb6VPoeEK5r4nBApbFycVJiYboIydOt
OkYziU7+BwzENBiAhiGhKSxylcQMjav75t55VLtudlXqbyq27d7kRtxYvP4OWroQ7W5xtYuI2+Rr
uW4ueTc21ybbs2BWtMaLE/uIoT5fH39fnrEma/hO3vmedu6s17ZV8Xc83O7jxeHt4/k8X0eY0m+C
9QETl2nZ2zXEhMouVrtvc3dudu0blSzduStKQ146bLibjdzi2zV0tdZSVckbv+17fuyv67kuXvdv
Z7l4nqe6s44KqtatXX28ra/AHCpB50DvqUSYvalS9VsvgG8v9Hs8OvRJaZJJZsu+vZvT8Nctqv9L
SypZUpZtLUpUgooUUKUKUmWXhU+/IhLpD9k+e6aSKLEYsQGI1IqJSlKkUVJVFVIifDy9/fh04YYf
NddddnjhrrZ/GD9sSOrwIzRRSlUlSipSUlppZlJSWZSVKRFJqlpWWlpUtLSlKS0tJIsyLMidtbXz
6vePYVVVRVJVTsyjt0LT+qHG+lrDpojJNCWLFKWJYiw+VgsUpQopTqsWUpRSlKU++xZSmrruvSnz
+dcGK3aS7126upJL5tq7urqSSSSZ3uS6lKU0ss467sMLWWUpfdddSlKX43XUaqCxRSlMTO67hjTP
ImSimG6mdNaVV88wzOqWCxSmW1yXUplYln1Syz/5JHmh+cTzChD4+s6t9vFT8vOUlPi31fht9fav
Vf1VXh8Xk3+2QqaBX8arqbEiXfz5SQk9B/YH70e+djhkOs0VTMWtKqjP8yrOCftlHsrN81t/mHPp
9mjdUV5UtVSu5/B8onWJwzPnOu21Vba91XFL9dTict597d5byoiIiJ+b5ur5fb3rrL3d5tvYrYef
o5OTrOHOc5OQ6uddXObrMuTlEYDE6lySZW6ldSTW6nJrnLlXUtzmGlKW+uejwIp4xVfh6TWSg5fS
SKazybZzfnDwEqqHdBQfQSs1glcMR/9fCfScgsRu3v9crN5GIypZjWXHRJFixLrPj/pwMbwy1qtV
m661byNy97WadCy6jg3EWTVVlU0yi/wgIUIphJYCRpNSpmT6qBYYBjKaWQvnYBOLMShCEBxsZGTX
IuJJMzBMSnxK08tkOptJv6mHbd2dotEVKaKLqnZw0na8A3L9FltN15xVW5ssxIcFoztkzwpYzX1k
/lltEcCxsnWTgyHrP2qhJlAQSBhhdAyGAdpRKUlNBLztwmSJSI2E/GJlq8XFwIudBtwM9a5mjnYp
dGmuyZWYZ3IYXglJARVLl/KsbKtq8GZa1v7M36NGrNwIo89fSJCTQOAckmyq3Z9PHfa0hlWTJiWL
W7l2VnRw6TNDIIBXirLdY6Y8QqrFgQhMSiEsGsgJskE+mM+cyHbTdbMdxwFUkyhgkIQ8ZAsgdowl
PIlKSnET2CY0UwhnJSSZCZAaNWPJoInMrNVJRmA0ykPRDOuKDApO/T6JptPHx2Cy+ds+kgJTxMJC
SQ0qQ2lJTcqKRIkZo8udzNEDWFcsGHlRIJD4tEU119SpOBaVDIjcjyYn4zgSta1rW7Ik6wzMzNLB
AczdWQV+M0vsyGjpeUCDlrw0ykxKTMnKqVQ4o5BGGLVoUKEuJaJMghpBq4Q1c6RWENEmhUGSjutI
eDWGu5yQLCgV1qFwoYrDfN7e0mzYtts2RsjYbI2M2yNmus11muuiTRNizYpspso1U1okYKTCmxkW
ZKbKb6bm43NzZs2aM2GhZo0bmrVuaMLLNGjRo0ZNmbVs2f5/EOPXr/Rj0krf3c1uYv+eblrq0kMy
SSTTTMkkzJKUCSy0lpLaS2GYZgyqWWWVLKylkpZKSyUZUrSpbSylllJZLKVlLJSJSilJS0h+sAn6
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



