# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100504065322-86kc4r7hj3cyg87n
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   cleanup/
# testament_sha1: 4e864802cf34b110470e1a7a3037ce844fe70a9d
# timestamp: 2010-05-04 00:53:29 -0600
# base_revision_id: marc.alff@oracle.com-20100503154132-\
#   ci8epd7ppl9d2x6u
# 
# Begin bundle
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
1YjSsXRZRjj+d9uWlabdUGAMiB0kROD4x8m4cBjTMHjSLmj16fXZjRo9Oa5Lk3MPV5MnvZPZhior
2buHEeE+Nn5IQgbpP7OVEIQNJrosMuX7f3u4Zdt3T+GWyTCKib+xRw7XdPVk0WVVE3q7DhNRw3Sa
aYbtk1zTKizKLlshFw4YcLItP0k4bMJ4Rko6IsOkW7Y3RbsPPOHjt24ZePGH8oQgPuEnbph29eJO
X0s3MpJP/3L6blF0nbLCqij7/OFmtm2MnW0Opod3dyd14egVce1jtdrmw6WTN+GyEO0Iw+mzdNDx
69NmW6RIw3XTSYcWww6W175RzdQTs+WPv9kcb8ylff4m2wpPJXqsC38JRp9/gc/52SleaqNtRkvh
MXyuiUZX4+Hd7ePl55+tmzd56uT1f4MKP4XxrbOdbfaiTZlVs4aZbMv3/jlwbrJMv6rMuFmXbZJZ
JNss3TVVUVUWJpLuk126Td2yms3TdtIouEkml38OWllTDCSpdhhum3ZbOVnLvvZNdV05STZcKr3m
8duSrl/nJRy6dJNHblz/aKMZv8YcsukWnwyTa+I6dtirL6d7I7KssMKqrlm6KTZlpss5+fXKiyKL
dhk2NTZywxhjDGOS5H7eeeXbUV/Yj8QXx+U7e3j4f7lGkapSubm8G14O54t7Q7mh4P1WVfk/U071
5xpNyoss4TZSaTRSXSbn8knHXKUpsuW7dZJFF+f68KPkVXLLDDZhF08Uf70IQgctIovGHxI0y+Pj
ZhJJdJpu6dPjth2wwmokwm4ZbuVjTLTdJJ4hqkY3RRcvzhJwcsKunbK7l02YXdt3jdFsq8bv7whA
hCijhd2ww0iwkoki8QdpO1XrZDx+m6Yh+yHSyKKf9Pl7H6UMc1up4JoAV29XuuSb/F1tFUYqq+my
ljpjJfHf21FeaqNLy5+HV0mkJGCED8P2Vfk+1X4Ybst2VFf6xtfbarTKrZd+zd+j9XC7t0qkmq2f
l/hsmcNl2XTTdGG5206RUbIcP5pqskkkkXSLrqTZ2yw6Tdmk0k0nThJy6NniiLL5CEIFmzS7DTCK
zLxR8hCED43Ze++mX8Qz433k+NPEXuGz45VbuHxpRhJrWX0q2KpMuDyVRwrjjFYq1XJ2sOp0sNro
bmbW3usm53Rk8UWPp2okwo6symoq+3DDtR2muo+fN3pl0kk9etNkU1rfrJGKMYxhGJRRRRRRTVFF
FFHtTmdDqHkSacv2hslNbH2+XRuw9WfmhCBfmM0IISkjFU0UUUVTRTVFFFFH2nS+Hl80o8XPu7/d
6Poww1mD5HTM3I00J8XCPps2CLMzfRsYcEUOh0PacjvDY9J6zH3+sk1C9XjbEZe+/z/Jy/d9Gl37
N37IsFVmmx0kiququo5YZkjy9YZWSJP90IIfUT+kYIIxpEh5ElH8o8njh0euXSLp2p2jCbZ48UUS
cqLn+DSb6bKrppPpwqiw1u/v3trS5Njpb3Bt27G50u30lHiqPF09HuxKPEqZhMLXd6zbna73J3sj
teUPGMN2S78LKP0ZfH4eppqOlUn4fo/N2w/6IdQ/44/aCECcKrOWnSqbw9hRp9rOUmKPhr6rY8/P
Y2O1hqbWhm7Xe3XXH1vCr5O70NVUZVZMmSMVRyviuPt7arOxUYLu37VaDKpXvvFrYYkmCcHCUe/Y
zWlUsvXYV6VD5qthJhGqnwxSjX6+2cf3n+P1o2frtD9n6v3/f+pRRtnOYsu26Z+zSyjdFNZ9TjGj
9lW6LTZRN/Jsm3f0ZRSXcMKl0UzdytDLdDvvhysykwXXXTUdlnKq7+jpRIo8RZVVdtKpLIqt1VoQ
hBCHqGXCzCSTx08809LpLOXTC7g6RdJO3Kjxhd2u5ad98KKquHaSa7TlphkqNba0Nr36P0sdHRya
mqUrY6XN1N7zVG+Uf4lHuPpKMfVUYo5Sj28Kivj5eq12V+2xZ3b3fXDGPtrvyqjV4l4l1omn9crn
Sju2797rv9/V7fo+ZUY+dRWL7c+1aI91QyL1VR9qhrRwpR9HrBaNl7vjKMeHdvVRk1PkqNNKPb3g
HOMSjSr3/iXhPwE6fHQ7+N8yxKft7frs36V59CxVGFgxd73DnfK7CTwWZ326UdCPv4Ri/nw4yja8
9yqOa7fpUV6TZUV99egdiqP17gmzfKP8njFEPwe48ComSCqiKiZmYqGAiompjzOGFRFRFRMxjH7V
DgifpCYoTEo68IWR9rRaI/jZKVlKNyy/Oco/Hcc7rsh5+ZaHBffn0z9rGqy6DCpXvytceq/f8fPD
6MqoxKMkjwWlfXvNqk5pksMNf0ya+u8lLUumsWa2b1Ri/PVbKvJ09GP/P47H5dXTkqhJ1UQg2kNA
jSDKidWDsF/RUa5f32LqiaJqMpRkEyGXWyOXhGmaGnP5s6s7cq6uWPrrqGqU1LqQsmJFtMrPT5Gh
f5qK84NFvXksgbHAe1BV4+YmDHNmFUwH8evU3OLpWyZF/Mo0apR30J4hOJfTKuzafP8VDpa/DlhV
4qjh7e1Udvutao5rm4yHUPIHsenf0uJWZg50LcRT79/KeNUDZqx4a5R5bzo6R6qowqf9lGqir4a1
Su8uVv4Y0LZZ/S9zWqjvlHP+2Uo3YtGymztVGco7o4lheWnIyyuxrVvqPzk14alipWotBpWiys0o
yPMwJBKodpEQGgwMaz0WZqqzXw1trbVmxF360X2B7SKCYDSIcnkT+XR8PPcmy93NFDg62sBDUOas
ENhUIVDcSYlGyobaowtPN1Ta/NQwSfa+KqDMEDs3Kpqmqapqmmt1vCajSWhfCkZtflKN3BQ0Ya3S
GGEGEEQvMBCFwfwza90dI1Jhoen6b97XFO+o2pR49W/lxZRHE0m22bOelM5RhUtNPNKOjwqK4I8d
zItLzLbf66KJ1YYwxYXOUdco+VZsMNCN2UFl3Uvrmx0fWor25TN53x9ti4lqsUjQuHesYwwTRxXh
5hyftyqG+Ua8i22EaEm/6dkZkn9ff23Dr8UcOyorgW2jdhhy4/3sxn2Y9PTMqNezVlVLaYFXXmwx
nmZRhTFhZqo43w9FRky9MnBUfHPf4//i7kinChISFs1MIA==


