# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: cpowers@tma-1-20110321020528-xu0od846oak5aoem
# target_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\
#   wl4896/
# testament_sha1: 2b17ac386e863c5c899720fb792e9f34e3dff474
# timestamp: 2011-03-20 21:09:13 -0500
# base_revision_id: chris.powers@oracle.com-20110319022924-\
#   gkycjz4t2n1pv2p6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTgbvIoAEGxfgFAQef///38v
3sq////6YBT/e0573va49br3uF7vej77e717wS5YUfQBR0Otu9yKONfWAPve4aKB7NXrJI6QlNDX
hJFNNKntNNU3kaSMm9Ro0npA9NTAEx6oyMajQZBJCAQCCaEYoyeoyjINAAAAAaBpoEBIpvUgAaAA
ADIAAAABJqJAKQaDJ6p5PSTaTUPUyPTSHqZGg0AAGESkCGiI9NTR6TaBPU8kaaDQ0AAADQAqSQTI
NCaaNJhNNE9JkptpqjQPUaGnqP1QHlGj2F6hS+oKnhH/1ByqqkVDPr7Mul3TzyohN2f3ZSQVGQYz
iqnQylqqYKsMu+b/HeUbFFMaWte+ZJdc8wtYxBYSBtGGed1gpZ09+BXho8VhSCTJPlM6xMVVFQfB
RSALCQPGyGAj4KhKRphhiCWJnLv14uqDoqgRKSZMpMpkjIYoMTkinqLvFnfw7w0qG+K43PlfAGrC
SRVG2CywRgaQ0l3WytJmeLNJgIRSipd7h7UImKWmxSFlbERIeiias4aKxYXa9Wzh7CRiqIqAj9cn
68XyXcd1rKdNKREaqW6ZQn/QxNaYD0kqVR9y4qIjMwwyvZCJWUiVRW3lZDzeon8CdpGEBQVEAWSN
RMTrD2yHChFo/3Im/HllS5wrNqkZEOv0a87p7MzPG483m26K7VSJnPTR3517L1syCtJDB2FWrhQY
WW5xYByNXWhObkrn+4ZVmbUqQS8Hbl2sZKYtGji0AJuAa66wiQMbMbguIZTsXYRtZzBktE2lJ6WU
+sJogFRqynu5U43TA0G6o1Ub2kFaujdizFLPKU43a1H4POReRebhjDrNrBWxBgkgxWGZAsl5h3wr
NYOykVstTnbkolhkJozbiil3yvCGHZ46TcDmeYs9F9VxLLIsWW61Lii1TnkvdcVNKXSZ9v438pDc
kD+XMAsjJOw/oTv3om2xoeATg0KJSo5lpeUup7TeNeutsC8agbCJ76vKE2gUuEdUSJO7NVVdXXHj
mLgTIXwzX+cildy2WuEfgIE09xgJ26qJjRnVqWWk14o7GzFhH8rNHB8Uuw0TRse15+mrSIjTtWgm
xKcpComFRt9nXgGC/Lqw+GrG+qozGfUyznNUy751XTyZSTvSpB1qTissmmx0u37yU0n7OSTHpM1t
Gae+kj+PcdO3m3WPWcT8D3+qPFTYodhbl50nP68be3lp9TjNVkVfvydajkggSIhAoggn8rm85lBA
R1tEh1gGZSCCiSFBpkksPwwzyTmTG5q4ykzx8XaFAdBauYcYHXpZ1/iyJgVGCKiKqkTDEIhIMiiK
WVFh+lyWilKTWWWbTmFJHlyJ3HfgFDKaFRGFRK90CigpQIh7KmEgLAMFSURGT377HkOXd35569wx
z9pIsJ8rki3Q0QGBZCu3e+pt9bnXUaXXcy2I1VVnERLh9g0A/MxQboN0THNxXqgp+fyJGtraEHT3
cjcvWzcDjSdhxmdQEdZJSZQkiUNQNryuTAGRlGCTiHnM70I9ZyzgDCpDMmnTEwnsiC1Bcp6jT7tJ
vpC5SAqCBCtLR9RA0JshGKnUsJLohYsIBDyF6LWHJesuiYj2R+EqQ+5i9XTPwaSFrt63Oajphj5S
8Ovima3MliOcC/GwgqR51dPW3fSWPU+oYQTn27sxO9RkfWNxv0+ZeIuqTe94NUKtUQwzrcs6leyi
WzVDZhmrIY9rUC0hTHWi3VhCw0s8Tg0qiH4ehKAxioBcq740zyOBgGC50TdhCUAVgSA74kC0AuSy
6IS6I0EBR0Qo5a1lppdFFZmvuLKgtAFajfhIVDiZpSpA4Zsy0g5mMfeGIoTNP+hZdmZsZOCFm97H
GnzHxGLC00u14e78pzldsh63QS+dwxLSVokjKR0KySHNE6oyUTBMpCaSBvkBn0ccjPJd3gAU+PZY
GskVlIKkqi73nS6Z/FZqu45NcgwkoL7NSi+lmT9nK9ji1VBS7S+36XpeUSi6GELrkVp5OzbI0JoX
0nFbSBloJwK2hUHpEM+93iozNQAZffNjpFm6DH+2C+5iKJknOHDyObHUgn7Po4I9qJwxySyOZDl7
R4m04ManwPjJdKPolZ9jUeeuYswl5HmhkKYpkdDI4P1AHn55Gvcejr1UrX2Bb0maKnHfadHmN2eJ
u1aF1Sbq+k7M8LIsMb05QhGQLAM8Sws3svjGIkSdvHmdCDNrMqDOuwyi+Ob+khCq3gXnF7AGQckR
bDJ6TmiVdHdT9DA8rA6rQlDptc6IhI4oyV126bDmR6r7Fka9a7ZrryfYdgjbrtPi1Nnh84WDfAyI
KkggcVHYBNAuCM6IO1vQIoTx1RAOfI0Rxs3fN5FcJeBOQxCSHXp4HSNupCK4EJqDFmKrwebHiDSh
6anaR0XkSbP3ueaQWNdl6o5mWmrDMUj2Nocqz3YnD0NvZQa9EVSDCILu5VnEMzNJ9Bov05m2k7CY
ythoLuS0xEIF70up3SsNtciGANtQghuB8yykH8cjbSszvxAWAl4HB2OZU0+nI6mmdizFT3H/llXQ
KxaRhR1JvOd9I7y9EOVkfJMxC637RizleTUGq2gdUMONdy5d7vmiPirjkmGAUw2u8h++2e70gkOS
VkHd5fQEUOxY9hZjvOJrU5Xc0SeJ34eTRvlw9bW6zYlngQ9ntqK3SWg4CqF1BgNEMuH0lwAFDQ2d
yek9GXtjKBhnCgC2KZZEqrqcIKns60INTsYMc1m3wTGhwHzgHCLSrCFDRM6co1v3D0H1x1rR6FYM
LGDnZQ0mQ67jLQliNyKtI9+MTJ5Wtepk6X3ba3dMRLlL3RrR2LmBYzVGjfsqUjM0iXKZz0tu29qP
EVbCDzMI4kvDRKhjG1LqXAara3QrnpOchoYH2cuApcEpMTMDLmYRU5Oc+YN9iQc0BmjmC4tkaX3h
oz3piK3oPStYewxEqLebTATuwmo9YlTwMEGF0osNdt4z0zob4NCxoNyuOgbOjHk0o4CPpiUEShAw
cwy4NzXY0OCxMNTjXU2nFGZkzDRgzV2JjcTJetC42titTKMOK8YMVyKZq1DVIy2E+Mn6GLIZpQp2
UeJVxVNAsPQmu9Ub71WFAx2spPZqoaxoQGiGuS5IVqm/IoPEjXjt4VAcK4opQuSA1MYsIQZnDxgf
EfzkPzEUij9LLKkqjba31qcRT7FBRShTk4cZ4RcXXW501utzjmmqJsDNG4ypXIcg1lGVJBkTaBA7
POSBxtpFRyHEkFe+VDcQop+iKr2i/cJGSBIyEvPv7h6Bs9Q9A1e3FgD9gGx0WUwInQP9rQX+Z/yh
J9nBL80SVwNabC+SG72qiyU1poiQbACuskR8dB/pePIZUFr89x9o1HZ1b+92Dm73uHKVmuSASLCM
ilpRSCFFQhQhUZxzjlMh6cCC9o+VFU9fe08hWFofVUpIY8J9BiyMM6CiGAmlWwkiEZIePFCxjpEF
4S/44NUwTQSLkiqqoisY8a4l7fDovDsutLG++dJmEsmCbDJ+wNQmpGIaGF5VVSqTGG6SZpm/ar4X
TOUqAOZHQ0kl1g2qTfIlEROCvIISdpz+HlEax1uK4utOsuKzbKk8pyDdQRLyIDlyOyJTYB6upVEV
jAL3PwHPkB83TzJ1BGTcykO4e8wP84+328zsTKQnGQ6nip50veW88jv065CZRishRl4iSeajDRgs
wGtPLcamDCG5b8/4OLxb3gs8PNZc/mWaOr34l73v4R08+5zYLbehPI27mjLAs+DHKSG2Z72qa3dH
98JPrUg7o3R92lh7VpJfHDmxsc2vZu7V/RwV1ZubGl+/cnZyTJ2ekTus8+evFX24XutT02Hz9ec+
U2YvKEJPvRlKREqi8WM+IyYL7P4qPR3yUlilrXp4Z0T1a7VTbSD2PQPd73U7tdzbm6O9th6NaOZc
6dWet4bZxkNyR7M7OwJkJhNZe35SxZeh0Iwe7Hb/maXMy5kaAWgU0GTpGyobVqHOhFJCQNt1l2kp
urNLvQMUZSAoiUDKsY8Ux3Ypb85mzKbf9DGdloJicyp8GGlzW4Ui0pWacU0Y1VTFS3EXlZSLWV1W
lYpaWJ+6xZPdHjxvJz8GXLK1UKRRRhatdFVE4s1Vw005uellnub/h8KrekjecXt47m/bZz9nouPK
dFfWPJPnBj3H04tKS0WSEGQoJcJ5iIZSHHQ385WtQLIAWasOi4afVBgvw73xWfva4WbltsT+ukEy
pIkPclRZt65OJPHOTMNRImt8Hr34rLvB4Lnouj5Pm3p7l7PLsU1zLAZ4vGMXaPon7k5mQZEcwmoo
9wnVjrK9CNcKi1Qd5OVGzSmiSPxmvZN684aypDxflTo669ocqWL3Gy0F69Yl0+8OaRGxggwnzkOp
ufLqbJJTFuGT2RFycs/SRfE7pmaY2Sm/1glsKdsSjCCkXVJVS1dve5s35MdJG8mW+cB8yepI4Kc5
4FSHiFj1XR/bsTyqCfSQ1vrX3rw8zyiIzWbCl0VJBJ0kOSHI88giKixChBgMFAVIkWCtz31DK4X/
HEBjXMRMpUBAs1uwCrjOY1DmrAoLRkzxqCKtnShgHcUJoUZuBvatUpKddoLWktIqzFNG9zlXLEiA
6jhWRSIQgof6ULN9RmzwpE3MCHNhxExvpee1tYRDnixHOYHU1RC8hBahdHNSF9K7DgSSR0XVsmEw
mslvjZkmSomVSaY9jBlgSS2J8VzKpCkYJsQkiRjrawEtkBCyDSI4QoPhOPbIuxwARYOQiFRa8wbo
ZYq74IniAIKBH7zXuPu6oiLo3TwFKUbZIs/Bs0c2rsblovTq/uFSLJd+PcXjNI5pNPwZaZ5oLWhn
OB3mg7QI8BBgnH67QM2wROWSSSSY8gamKN+IvEDmds4UviQN0pSC7ZEYS1okqQukJ7171i6MoU7S
bUyD4kwB6MUNz5LxiYeGc0kNE3YitI5WZcndsvasqaFAuWsuuEanrIXE+OGW0lH1pRqiVhAKqoQp
gc20ynv5nbME1AGVhKZEtFqIpqFl2S+PNK7MNJb0oqpYcXUgwayXyRPMMpwpVR33xUnM2RGMWIwR
FuAFgiUdx/mUBgxElllWDZYVaXdXCZA2TAwlGIQiMuyxIFCVC4EYgKjIUICRJRQyI0wSJdkuyMA/
6S6B4PObyB0knbQiclSWkLKVJ1sVj3nlrHUSOuRS8U0sxUiVfzkLYKjZmhYWVHEBIUUaYcFiGWCp
BBgBQkqCQXqdGqL1nRZexfSeoXE1qSBnSSMLJZFqRItFPyJ6Wkl8GTO6SdfA6dGKuJC8C8i0Fg5y
sFLCiYHSQHQcQUaB12m6GtdvXOZfI+MiYurSRvSolUlyShOxWxfyWbLn0i+yL5LOR748P6Jkk4vF
YS+IXbu2L1pdTtbTTvekw0TBKSa562z7X6tSy5Bxj6Bzb18qQyT6BTurc7O+QLJNQ9sH3mxgUkBY
jJRGAsoKhZJFmtyiHymLHnIb8G+aZ7pO0VBNp7wDCKzoSd/P5pSC/4u5IpwoSBwN3kUA


