# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: rafal.somla@sun.com-20090811083223-jw65ns8twnif15zu
# target_branch: file:///ext/mysql/bzr/backup/bug46266/
# testament_sha1: 86eb9de884e9ea6d6afff61857676c0ecb9c7c2a
# timestamp: 2009-08-11 10:32:32 +0200
# base_revision_id: rafal.somla@sun.com-20090804090023-\
#   f56npka231y205cg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc5u9Y8ATNn/jEAwABB/////
f/f/4P////AAAIgAYDZ/eEQSAAAAAAAAAAABIIgAPbAgAAUAAUVIA6NUCCkBEAAAAAAAAAAIIKAo
CgAAAABERAEigABQAKAAAAAAAAADSp6mQGgAyAAAAZNDEAAAAAOGhk00NMjQ0yMgyMjQyAxNGTQB
kyMQw1UP9VNAAANAAAA0GIAAAAAAqp7VRImJKPKae1J6NNQDQekyekaND1AA0AAAcNDJpoaZGhpk
ZBkZGhkBiaMmgDJkYhgqSECAQCaGgEAmp4CaEwqftTSN6U9NU89QjR25J6SH5IeCFgn/+T/2USii
UUcxjmMcxjmMcxjmPqOThOf4pwnJOE5JwnJOE5JwnJOE5JwnJOE5Ogc5/u4f1MzMzMzMzMzMyHOZ
w/QcPz0PeBMJE1JqaNFyXLrrkuXXXJcuuuS5ddcly665Ll11yXLrrkuXXXS6kpSUpKUlKSlJTOZn
MznY4dOEdpmZmZmZmZmZjjocJMzMzMzMzMzMnOOdGTh+A836T3pJJEzMyckkkkmZJJJPrOdnhwzw
8PCSSSSdPwvvv32eTyZlKWf4od7/t4t6J/dKFJQpKRSUKSkpKJSUKShSUQO9IlJwcz8s9XCP9mfI
xMmJkxMmJkxMmJkxMmJk7DnvfMz6WTJkySTJkyZMTJJMx8GMxmMk7cTtnTJkyZJJkyZMmJkkmY7Y
zGYyTtxO2dMmTJkkmTJkyYmSSZjtjMZjJJ246ds7ZMmTJJMmTJkxMkkzHbGYzGSduJ2zpkyZMkky
ZMmTEySTMdsZjMZJ24nbOmTJkySTJkyZMTJJMx2xmMxknb3vD3unHh0zwyZMmSSZMmTJiZJJmPJj
MZjJO3E7Z0yZMmSSZMmTJiZJJmO2MxmMk7cTtnTJkyZJJkyZMmJkkmY7YzGYyTHTOnb5343veHyM
+U+wR24dskkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkknTnTp0+JztO3bMkkkkkkkkk
kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkiTMnbnh+09XzpJJPDp06SSSSSSSRxn32ZmZmZmZmZmfE
4eHD0cPDh8zk9XaSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSQiZkkkkkkkkkkkkk/1cOnTp
JJJJJJJJJJJJJJJJJJJJJJJJJJJJJIzJmM5kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
kkkk/YZ06TOnROkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkzMzEySSSSSSSSSSSSS
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS
SSSSSSSSSfQ83aSSSSSSSSSSSTt+Y9ns83ZhhhhgwwwwwYYYYYMMMMMGGGGGDDDDDBhhhhgwwwww
4ODZZZZJJJJJJJJJJO3ueEkkno4ebh6Pc9Ekkkkkkkkkkknk8nuSSSSSSSSSSSSTpwzp7nm9Ekkk
kkkkkkkkkdu1KZEN6zRsuuuupZSy5dddddddZZZdmphhhddddmuuuwyYYUWZKUphDCGyGaGENVM1
lllllkkkkkkkkkjjzcMySJJIierh6M9Ukkkkkkkkkkknh4eEkkkkkkkkkkkkkkkkkkkkkkkkkkkk
kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
kkkkkkkkkkkkkkknk4duE4Th5uHb0T0dAggggggggggggggggggggggggrrrrrrtkKQ1ZNHJPBDg
hdDJDw4ejh6PZ0kkkkkkkkkkkk9Hs8JJJJJJJJJJJJPZ7nmkkkkkkkkkkkk970eaSSSSSSSSSSST
OeR7iZ5JImZkjEmZJjJmSRx5kLtfsxtr9/55WW/3/5aZ19In9lPobN7gspxXelkyavvKfMsGBKTt
b3sM3Wzfo63c87ik0eBOiSxRLKYE+CH/K6JGAe5ZJFlEWQ7GQZp70O5YyQpDZ6GELuCz0TEo99eZ
a+e/80KXatR2pyTJPBOBLJxSE1fyXWbNhsmyZJsmxLJskJZsu2bNhsmyZJsmpLJskJm2XZOpk/1O
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