# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: rafal.somla@sun.com-20090813093400-uqm13abvfhvpvd1d
# target_branch: file:///ext/mysql/bzr/backup/bug46266/
# testament_sha1: 524258dd51957b4e1c7953c4b41fa0486560a229
# timestamp: 2009-08-13 11:34:09 +0200
# base_revision_id: rafal.somla@sun.com-20090811110931-\
#   piwv6pc448r1i70h
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYw8wSIATNL/jEAwABB/////
f/f/4P////AAAIgAYDZ/PEQSAAAAAAAAAAABIIgAPbAgAAAABQSAOg0CCkBCAAAAAAAAAAIIKAkC
gAAAAAkQgCSgAAAD60AAAAAAAAAGpT01Bo0AYmgAADQBoxAAAAAHDQyaaGmRoaZGQZGRoZAYmjJo
AyZGIYaqH+qmgAAGgAAAaDEAAAAAAVU9qokTJqRkjNT1MajEA9TagGINGRiBoBk00Gko0DTQANAA
DIAwjQAAAAABUkIEBAE0yAmmQp4mDUTaaSemJNtFHoyTJo7Z25p5EP3oYQsE/2J/0USiiUUSiiUU
SiiUUSiiUfaSyE5+VOE5JwnJOE5JwnJOE5JwnJOE5JwnJ0DnP+3D8TMzMzMzMzMzMhzmcP2XD1If
IBMJE1JqaNFyXLrrkuXXXJcuuuS5ddcly665Ll11yXLrrkuXXXS6kpSUpKUlKSlOZnMzmZzscOnC
O0zMzMzMzMzMxx0OEmZmZmZmZmZmTnHOjJw/iPN9l7JJJEzMyckkkkmZJJJP7DnZ4cM8PDwkkkkn
T+V877rPJmzKUs/Yh3P+3g3on9UoUlCkpFJQpKSkolJQpKFJRA7kiU5wcz6J6uEf9M+JiZMTJiZM
TJiZMTJiZMTJ2HPZ8jPmZMmTJJMmTJkxMkkzH1GMxmMk7cTtnTJkyZJJkyZMmJkkmY7YzGYyTtxO
2dMmTJkkmTJkyYmSSZjtjMZjJJ246ds7ZMmTJJMmTJkxMkkzHbGYzGSduJ2zpkyZMkkyZMmTEyST
MdsZjMZJ24nbOmTJkySTJkyZMTJJMx2xmMxknb2eHs6ceHTPDJkyZJJkyZMmJkkmY8mMxmMk7cTt
nTJkyZJJkyZMmJkkmY7YzGYyTtxO2dMmTJkkmTJkyYmSSZjtjMZjJMdM6dvrPvPZ4fEz6Z+oR24d
skkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkknTnTp0+BztO3bMkkkkkkkkkkkkkkkkk
kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
kkkkkkkkkkkkkkkkkkkkkkkkiTMnbnh9t6vrJJJPDp06SSSSSSSRxnzszMzMzMzMzM+Bw8OHo4eH
D5HJ6u0kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkhEzJJJJJJJJJJJJJ/y4dOnSSSSSSSSS
SSSSSSSSSSSSSSSSSSSSSRmTMZzJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ++zp
0mdOidJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJmZmJkkkkkkkkkkkkkkkkkkkkkk
kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
k+V5u0kkkkkkkkkkknb6T3ve82DDDDDBhhhhgwwwwwYYYYYMMMMMGGGGGDDDDDBhhhhhwcGyyySS
SSSSSSSSTt7nhJJJ6OHm4ej3PRJJJJJJJJJJJJ5PJ7kkkkkkkkkkkkk6cM6e55vRJJJJJJJJJJJJ
HbClMiG9Zo2XXXXUspZcuuuuuuusssuzUwwwuuuuzXXXYZMMKLMlKUwhhDZDNDCGqmayyyyySSSS
SSSSSOPNwzJIkkiJ6uHoz1SSSSSSSSSSSSeHh4SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS
SSSSSSeTh24ThOHm4dvRPQEEEEEEEEEEEEEEEEEEEEEEEEFdddddddshSGrJo5J3ocELoZOHhw9H
D0e90kkkkkkkkkkkk9HveEkkkkkkkkkkknve55pJJJJJJJJJJJPZ6PNJJJJJJJJJJJJnPI9xM8kk
TMyRiTMkxkzJI40IXa/bjbX8Pzyst/b+jTOvqEup9DVub1lOC7xZMmr7ynzLBgSk6296jN0s39nS
7Hg4pNHcToSWKJZTAnyIf8LokYB7FkkWURZDrZBmntQ7VjJCkNnnYQu4LPPMSj215lr57/5IUu1a
jsTkmSd6cCWTikJq/yXWbNhsmyZJsmxLJskJZsu2bNhsmyZJsmpLJskJm2XZOlk/9HFwZqcGw4Jw
TJNycCWTckJq4LrNmw2TZMk2TYlk2SEs2fO3NzcNybk2TcmxLJuSE9z3Lm9xMOoPO/UskWUyEoWU
j+yHdYQyUyGabLJdJRRKNFnQ3N6nJ3hZdqho1Q1SzocztOt5wydLtdy7i1dLuc2jD2tHInyrOss7
GxShk3uTe5t7NZZZZZm0Q3HMOLxQyJ40h2IamxRR/JPmUi5cyczYUu4OI7k6kyTyTYlk6UhNWy6z
ZsNk2TJNk2JZNkhLNl1FNmzYbJsmSbJqSybJCZtly6ncpZZYphvS5kUoZLKLpYucilKWF05iiJdD
vQsheNhdqlOSUulLpS6UulLpS6U0Zb+Odt69vc2yUpssssssszdaQyT3Pk/tcm8TxfA/t5H+/+b6
H2CyfycELj0Olq+IyX7FKUpRSlKU+t9y6HpfL5iewlJq+Z/jPrepSqlVv8px55cfkQ6wn1vsfUhn
70Kfpbv2uhayynF8OOWm9vf5L9myfg7XkEu1cVlKecTkwegpksWWWLNt3GudcHtMiWUJ5JdZD7G4
1XdSyyyyyxH3NElKJSlKKUoouh2aHqR86kU8DzvzHFcopO4wwwwjBRo0RouaNDRcopNClntXQ9LY
2RspFNDZsbLlFJqYYTDCMFGjRGi5o0NFyik0KbLuhsh+CH3DxQp/MmTk8GqH8HBDIXbn8k/RuHeh
PMpSlO5NFk8U4zOcxOdPkds6dJ0xOnMnTJ0lLLqXXWXUwYTC7CmGEwuwpddZdSz4MJZdhTD2t7NO
1DkhdEcj/ZRQpKSlLOkS79CH+DxQ/j6WQ3mp8D9iHc7mGTtO07kWSyWSwssssssss2ZKIzPfIf2J
hqySksm98i6lMzMzMzMzMztnb38e46fXZmYzw973vZJJJMzJzJ5Ofac+Yoo9RZRT2kS5O8+GXVdZ
sbmT3vehrop5mz7NPl7DkjNSKeo3Pgdi5RSeswwwwjBRo0RouaNBouUUmhSzqdTZOtScXs6F0jQh
SHchSSUlFFKSkPtUh6XUzN1OoyQsueoTzO9w3M25w3Lb5h+X2PSkf9OTUu3+TZ6HNm6E4sLqb+x8
G85qbfCqs/EdRSe5+ni6XJ3OTDN2uhOCeCyyUnsdnNu3N+Kb3xs7n7mblTB3N6zTc5uLDzrsNifI
6Xn4HW9DOdLwb82bhPOoB0mcEQe8qCyo3XKvgkvwmU4z4HxSmpghTKImBAMIBCPVSRKqqT91vFT7
FOaFid6H7kKx/EfU96w/Up7XsdDR+ZKZP0qPMopTwfBdZSliz0ll1KZpDtQpPleD9bRd9RDRNTYs
WSyWSyWT7A2UhRP9Vglok3PQJ63qfuaul+5m4P2oe5l+g+hq5l1PWnm9GYzMzMzMzMzPmdHmz5X2
JMjVd7XoKKKKUsnS6XU6mroatEdTqdTc3Nzc3NzsQ4kKbm97Fne4P8VLKZI97qOwPxYLmZqhYXeS
GE1aGZ53Nd3knL70kpJPnKUmc1a/N66qPmiZv80KAoJl4Pu3p5nl6rn6PqJlOyYff2jpODN3tz7i
nYs+RT7lNFnO6fZ6jwZuLHh6D6R8LnkciEk5OQkzJmQnJySJOnPi6Ojskk5JJJIkSJJJJIkknZ06
dJJ0zp05JMySRJmTJkzIkkiTpnTp9Vzhz2tudMpSlKUpSn2CelJYumadT4rrsLJOQkzJevOPjR2d
kk5JEmZEkkzJJJIkkkiyyyyxSznNJOxTlTsPzjh24Xw/wZ27PQCdSglPmQpDihzQ9KHQh8yGNV2r
LMSLIwWJKUiUlKKhl0kv5braiZqEo3LjO1ryGlxe15SRSH70NN9kN6kNGbNdDTTRm2ZIZvnWQqM0
LIexqwsuhdeRZCxH+k0G+bTbJDB+jKYnuQ96dybidifEdiToUzMzmYMzMzOZgzMzM5mDMzMzmYMz
MzOZgzMzM5mDMzMzmYMzMzOZgzMzM5mZyOzDhxns4eSRPQlEkpLpYkliiSUUiJOSFJk60KZI4ocU
LtEpBHNCm5DrQskU7Di3qMKWUZNyXJdSiyHNNGmRPYhZhKQLiKYUyTBQb2FkbpuSI0JSRLobCQ7P
pTdIW71iOx6OE1QwtMp/O/CmSHw3pE3LYn+OEL8+Xf19OrchClIcR0PFzwTJRJPoFIfqnzMnTHnS
SIaSiGaHi5UshveLrIXQ7qQ35y/hxZIZiTflTDLsZp1J2F2jk712TRPFLE2nyIXS6m5JRSxSSkWI
pRuROpq849e6ed2IexPoT+jipSj8E4DziEedDNInMoklJRJKaLJCHmQpO1C7RKTuQ86FzRNiEelD
rQ0S6MilFPMh8drdLzGiask4JSUnFZLJSUlJSWWSyaMNl3SmZM0ulJSWWSyc2EO/rTMlmb1YTCb0
KQc3icHFr3am9I9jRTJm0bnc6Te6VFKURGbiS66lExSJSkzQ57d3OIpxZIdYE9CFKUkoKKQoKAmR
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
z5ccPd/+Ikg//JIQcH1qQf/xdyRThQkIw8wSIA==