# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@mysql.com-20101020094955-fr3nxe2j2h106p12
# target_branch: file:///home/jonas/src/telco-7.0/
# testament_sha1: 170419e521df51e70372eac2847b6a827cd7055f
# timestamp: 2010-10-20 11:50:19 +0200
# source_branch: file:///home/jonas/src/telco-6.3/
# base_revision_id: jonas@mysql.com-20101020071258-mamleyk2226czwe4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ60UZcACDR/gHwQAgBZf///
//ffIL////9gDj1r3NXNu+u3lrBAQhB3Lz2V7AFtRRKqhVQPba6phoI0mTQqfiiNqP0UzT1TRo9T
AIaGQGhkNBjUCSgJhNMkYkiMj0mm9SaAAAAAAAaDjJk0aA0aYjI0MQwJo0xBiNBhAAYM1JE9CEyM
1NR+lHoNQepk00ekeoAAAGgAESiCBMpvQqe0yE9RPKZoamamT01ND1AGgADQJJJghMmjQAGiekBR
tJiT1NqNA9TR6jQAaJ5EA2n/d5F12c6N3C9mOyz63+eTmn8/csPnMEFCrWOVNliyKfyS4x25YbUn
laGxUNWiXnmGfYDc7CERrbVIdSY5Qw2lWRgxBt11342i+vj+woIiwUWLGTRd99aVIIJ7GxgxM0MJ
BYoxMixV5PJxWzqFovIiLQYAAvYqwWsUMKhRSQdm3d92o2pk1fvu6suaSzimMkqNrnSz+/OKpTWX
Q+JPGtCeRMYADSAECfPJ9Rt7+jRPbHUlmeXl168E+BTlKC0g0ihbUJKJHs7KYPg61QZ0IlD0tkyt
ndesGnv1MO5tydjVRByGLK0EX4wkhLDi1S3+q/jilK5RsKFphRwoiqvVqSJ2RnuoJVLEif010xjb
n17PzXFcUcJ2RisZZZI2nzUB/eMFcdnV2p7ufV0jZmeutRsG5kLjIMy1k7YW1TyHerGmkkv4rMcg
pmNBf6ODkwxVY8Z67X9sMUfzt9DJeLt3b6dZ4PbPSWdPN/K92CMDOC+Cy4L/Hxz2ttN1yrk3uIaQ
JPdjXxBCLNdCVbxhkOA5AzwpeVNGi94w74pm72nCpckBJhj55wB7IlSDj56GLt9v1z8bHL18la4k
0hUHaqm8MMDgDbEL4B7zcEfcCd8BGM/Yti+VgVHl0Byf5CPQHpdZho+nTpwtwMni3aYKkB3QcN23
O0c/g995SghcR5RpWW1xEKIh9LQG4Wu07dabkPMJugbgQxrODLx20xkuU3KsgTGBQKmcFDCGGSQ9
xCDHg4chQchIcIRT1htGS7RoOJ0o9CChSj4gnWBTkPmPufHURBJ8h6E5IcCZlRqBWEIAoyStizJm
5UMNUWKuCetjstF1KSizPcovwlIkMiqMVVLDEQ06SFzMUMU1Caa7omI7hGArqIe9Zfr1XjmrmqU/
AzMlB0+xneD0WGVM5Rj2Y3v0c1WsUiywYNLg4ItaIGcAswTnsSIk1qpzgMCVyWOVgyYFx4jUfOgx
vSIYXa2wDsgkTYsxai6iHDZGxz5imTIEDwoXLdnSQL+tFK1WFNnQ8x0Et2Ia8GxBqiyHUE5CCKw5
CRtHiGHJpSAO+AKoaHG/XgF3TulWGCc0czIRJhKwtJEw0MRYnVTskoW74PQpFJk0ZMlpB44fGVep
9BA1iKBH5CMUlLba2S3O51l4i20mZRnQYMykUeaShEYRE0DMEKS4eHQYVLJVsFrJQGvo3UkqSel5
qLKY9etLy4vzSCwutDqaBGXsdOIOIlN+iTWbHMhO1IE4FDaBQwcUP0HIeONsdE7wtLO0dzV2oUTd
XWRpllpgQWpI0sbJ7WTjuCclk3zkatdzZhE7xjUMJyB5J+AaplgawwXvwdhQrpM0zk4Mx+YiD9Bp
KjhzqMvGr6CHwhAahRhQaZR0rPWgdB5wYaaGQjXylrW0MDTBKVYH1vkDC+acOHDujjuFdh2pIoaG
x3fCllct3OVMP03Y91oskosvUbQ5tjGrDBUJlysY0aZy2oJFgWiK6hjU4uKrdzh9JB1CoJ7E4Rlq
OHYHGIXuD8g07WXQGVTFXf9wySKRFxdtdr2amIqgNmocTLDNVPVQWujRkrBqOIXTiQ6pqzlMk7Jx
6QllEcqF2DQZAgPLVsrv2CLKVPRpcxFxzjESOS0AonTLpcpeHRwzEX1Co1C8prjOzsy098rycDuI
RxlmkVkNBTBnFc7z1lzmp9NNMZKswfM7LyiJiws+abvzkaawuXN6kDoHbZ++Q1wG+FRhN+WrzeQ0
gDJklCUyJaekUkShOgirOBpIpxwPT4kFTSc5Q8XMxfhQ81NXW5jRcu8hahtc9ANR3InFTS44+Jqx
nCzidAS94hTPGqF12SNgMcTL0LGnVeTHstvBvSXTJBp70pAgvZu/FCycrSGvEhsHUhzeOYhggTOT
MIGNOl6X3E45WLr8yal38/4e7uL/Y53AIQIshJQPlxUbvyvD6v1s1WaMB+sPEY3ytL+0QA6v3C/s
64JqjU7IkKZ9ZD4IIGRzmOQ+C4sg2NXLtgX2VPJRzqubB5adS6pmCGJRlEBtJqHRMUU5lT0KkvM/
2N/7IPy7O5MZoP4QfwfzfvXyDxRmPEKHjYJbyvrohRvG4YlH5hqjda0J4lJ11GlShemTfc1BtG1L
m8KFMpA7KnTz1yCHr6vV2HZ8+Qo+PwPwGXyZGeVJGVUiStiSPn+gf+ovNeYu2m4Ik71lLS/uDYbn
tUODuR3hQC05uM20J2eOn36RypjDJXHLKiZoWDG6Hr9fOchHMLIBVOjGV0EaFqBwwUaFxDTBC84v
VjazXgUF5hmG0nJ9FFKikG/ErYkPPuTBtq6lBXvD3p+YP3UBEpGFYFwdV8rTQZV1PcgC8SnUd4cz
ntY8n4hv8SETZfDWLA3GdECRaD/w14q0NNJyPTa9Zh4dSJ9G+Dd6boAKxOOLdNgMp0D8A/FhTBaw
vuLqAq/jgEQ/PEdwc4m/mLvYt5LIUHeexwRCa3HP6DETvJlghl4FgJxQmy49bLElXHg4Jr+URyRr
GExxC8cODjxxPEuO+ZdzDFeDKk3ORE9iDYgecELiYBgGQx3quYbw7/bwz1D8pZl9ZWCjJnu+jVZ4
VME6oKkWx0OwtTWOxjktz1BFBxp1Dwqc61TXO7LDRhS1s/RXXqk+IYPQ8xNpJAoaWx8J3hxo3kGw
xoxeTPWULLDNAfWXFpdv34WFY5Wa9ep65DbUshrIhodQU1ZOB5GO6yn8MHEOt2s0ywObZR32IWIQ
FvF0JgGbk5MyH1dBb08nJYScVp9AvmHQTkVPOCXtckvS/IkuYTTVnQFYa97dzm6mIccKDA8SZAxp
g8fI8Tj9rOS8uQYkvDe6lB3ECig0oLTkWBtB/oeodA5DRrM2YxmMvXqeESUbgo9BS0GxuJoWQIXg
+qxVsh2QOlYkesEczuCspXRIlceAQLEGIenb8R59awEeY4KE8d5CC1fFt7yqrmEwpBxpFHKMxAGO
SQMSDlPgtIdgp3Xk1tpx8juVjbc93X5UO+DEOf36iG9G8E+Qki7qg+PnRuNmS/v06z7FcEww9Ovp
fC5nK5hgJlZm93NJO9AatFqx4WrHMFguP1eIjUHPqHoGHAM4azYJ+BzEokKMKDCgRpufQHKYjUJv
MfqCvqhXiHqG4XMMAchfYG8ieYwUmg31KCVNgPAcitrVxERuIZcnjKtvho9KPWwaU1A7gVLvXkvA
RiVAsqkhSvMiFYfPH1BiLISMpjEo/DmfJO3yyyqQK0ozcHnPg3gbQ3POvEZmskJA8BrUwGI1mNjV
I2qdAW0nI8YlwaXvo+Yv5swNzMyF4eQwD3Kpov4caSUveG0GiGhWD23NB1hgNEBxN8C2fbVHO+7b
iY/y7gy0CrJjK4VDgVFrA7wNRuVGU1lS+2HYrPMxZeiTW0VpsKjUYhCA76bCIdInD5TvHtoqlpcW
YTnDsYngOCnYFbIjWKJkCt5IELxYtAf+egVPeO1tLmL5+imMMMzCIEWvmz2KbfWBuE+nAJB5RHpM
zFAnB07BQCf5iILUINAOeEtCPFOEwJ6C9QuWw9AzHtLcQkHMYBgxzFtq2hlBikwAqDE0JJFWYWtr
kJmA3iIh2EUD0JwMQRNSQQCTwmJswQBNk+iuIIRD4UGZfYnIKzbkz4lyVREVpykTmrA4FJjSnNpO
G8eg3qEWDVSqKLIJyywEkTCElYnl53KFqyWg7gGCmnThbcJ2NTGCBt67Ogn6iEIQhvVS8cdrybZR
3GktZnR0HXTxWGPlpKhxn0jqwe/rCD0gwaSlJUAOQyJAtW4pRSUMWBzaqpASHush8lk7EnwunXhe
EWV2qaBIQMForIIOodD1O+ScwerRGOwOC29JZ0Fgw5XaC5IUVsugdoNS7B1vYv3zMPB2azKWacJp
niN7/BA9C2l7lFE21A93ELAkDzse02bdVOTOu5NBQPVDcN0l3hFRvxFl4Akl8lywQHjvIGAIEhod
9gUJGe4RnDSF4XhmANgSC5AxpMushrCQbsywSSNp7xFgZ8qTRLyldEcjb8fJD/cpKSgP+LuSKcKE
hPWijLg=


