From: Date: July 3 2009 11:39pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (jonas:2932 to 2934)
List-Archive: http://lists.mysql.com/commits/77950
Message-Id: <20090703213916.A50FB91B651@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_JasQWnUonkPSre7Kf92Elg)"

--Boundary_(ID_JasQWnUonkPSre7Kf92Elg)
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-transfer-encoding: BASE64
Content-disposition: inline

IDI5MzQgSm9uYXMgT3JlbGFuZAkyMDA5LTA3LTAzIFttZXJnZV0NCiAgICAgIG1l
cmdlIDcwIHRvIDcxDQoNCiAyOTMzIEpvbmFzIE9yZWxhbmQJMjAwOS0wNy0wMyBb
bWVyZ2VdDQogICAgICBtZXJnZSA3MS1tYWluDQoNCiAgICBtb2RpZmllZDoNCiAg
ICAgIHN0b3JhZ2UvbmRiL2luY2x1ZGUvbWdtYXBpL21nbWFwaV9jb25maWdfcGFy
YW1ldGVycy5oDQogICAgICBzdG9yYWdlL25kYi9pbmNsdWRlL25kYmFwaS9uZGJf
Y2x1c3Rlcl9jb25uZWN0aW9uLmhwcA0KICAgICAgc3RvcmFnZS9uZGIvc3JjL2tl
cm5lbC9ibG9ja3MvZGJscWgvRGJscWhNYWluLmNwcA0KICAgICAgc3RvcmFnZS9u
ZGIvc3JjL21nbXNydi9Db25maWdJbmZvLmNwcA0KICAgICAgc3RvcmFnZS9uZGIv
c3JjL25kYmFwaS9DbHVzdGVyTWdyLmNwcA0KICAgICAgc3RvcmFnZS9uZGIvc3Jj
L25kYmFwaS9DbHVzdGVyTWdyLmhwcA0KICAgICAgc3RvcmFnZS9uZGIvc3JjL25k
YmFwaS9UcmFuc3BvcnRlckZhY2FkZS5jcHANCiAgICAgIHN0b3JhZ2UvbmRiL3Ny
Yy9uZGJhcGkvVHJhbnNwb3J0ZXJGYWNhZGUuaHBwDQogICAgICBzdG9yYWdlL25k
Yi9zcmMvbmRiYXBpL25kYl9jbHVzdGVyX2Nvbm5lY3Rpb24uY3BwDQogMjkzMiBN
YWdudXMgQmzDpXVkZAkyMDA5LTA3LTAzIFttZXJnZV0NCiAgICAgIE1lcmdlDQoN
CiAgICBtb2RpZmllZDoNCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9jb21tb24vdXRp
bC9DTWFrZUxpc3RzLnR4dA0KICAgICAgc3RvcmFnZS9uZGIvc3JjL2tlcm5lbC9i
bG9ja3MvZGJpbmZvL0RiaW5mby5jcHANCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL25kYi9pbmNsdWRlL21nbWFwaS9tZ21hcGlfY29uZmlnX3BhcmFtZXRlcnMu
aCcNCi0tLSBhL3N0b3JhZ2UvbmRiL2luY2x1ZGUvbWdtYXBpL21nbWFwaV9jb25m
aWdfcGFyYW1ldGVycy5oCTIwMDktMDYtMDEgMTU6NTg6MjYgKzAwMDANCisrKyBi
L3N0b3JhZ2UvbmRiL2luY2x1ZGUvbWdtYXBpL21nbWFwaV9jb25maWdfcGFyYW1l
dGVycy5oCTIwMDktMDctMDMgMDY6MzQ6MDEgKzAwMDANCkBAIC0yMzMsNiArMjMz
LDcgQEANCiAjZGVmaW5lIENGR19NQVhfU0NBTl9CQVRDSF9TSVpFICAgICAgIDgw
MA0KICNkZWZpbmUgQ0ZHX0JBVENIX0JZVEVfU0laRSAgICAgICAgICAgODAxDQog
I2RlZmluZSBDRkdfQkFUQ0hfU0laRSAgICAgICAgICAgICAgICA4MDINCisjZGVm
aW5lIENGR19BVVRPX1JFQ09OTkVDVCAgICAgICAgICAgIDgwMw0KIA0KIC8qKg0K
ICAqIEludGVybmFsDQoNCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL25kYi9p
bmNsdWRlL25kYmFwaS9uZGJfY2x1c3Rlcl9jb25uZWN0aW9uLmhwcCcNCi0tLSBh
L3N0b3JhZ2UvbmRiL2luY2x1ZGUvbmRiYXBpL25kYl9jbHVzdGVyX2Nvbm5lY3Rp
b24uaHBwCTIwMDktMDYtMTMgMTk6MDk6MzUgKzAwMDANCisrKyBiL3N0b3JhZ2Uv
bmRiL2luY2x1ZGUvbmRiYXBpL25kYl9jbHVzdGVyX2Nvbm5lY3Rpb24uaHBwCTIw
MDktMDctMDMgMDY6MzQ6MDEgKzAwMDANCkBAIC0xNDksNiArMTQ5LDEzIEBAIHB1
YmxpYzoNCiAgIGludCBnZXRfbGF0ZXN0X2Vycm9yKCkgY29uc3Q7DQogICBjb25z
dCBjaGFyICpnZXRfbGF0ZXN0X2Vycm9yX21zZygpIGNvbnN0Ow0KIA0KKyAgLyoq
DQorICAgKiBFbmFibGUvZGlzYWJsZSBhdXRvLXJlY29ubmVjdA0KKyAgICogQHBh
cmFtIHZhbHVlIDAgPSBmYWxzZSwgMSA9IHRydWUNCisgICAqLw0KKyAgdm9pZCBz
ZXRfYXV0b19yZWNvbm5lY3QoaW50IHZhbHVlKTsNCisgIGludCBnZXRfYXV0b19y
ZWNvbm5lY3QoKSBjb25zdDsNCisNCiAjaWZuZGVmIERPWFlHRU5fU0hPVUxEX1NL
SVBfSU5URVJOQUwNCiAgIGludCBnZXRfbm9fcmVhZHkoKTsNCiAgIGNvbnN0IGNo
YXIgKmdldF9jb25uZWN0c3RyaW5nKGNoYXIgKmJ1ZiwgaW50IGJ1Zl9zeikgY29u
c3Q7DQoNCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL25kYi9zcmMva2VybmVs
L2Jsb2Nrcy9kYmxxaC9EYmxxaE1haW4uY3BwJw0KLS0tIGEvc3RvcmFnZS9uZGIv
c3JjL2tlcm5lbC9ibG9ja3MvZGJscWgvRGJscWhNYWluLmNwcAkyMDA5LTA2LTAx
IDE0OjU3OjI1ICswMDAwDQorKysgYi9zdG9yYWdlL25kYi9zcmMva2VybmVsL2Js
b2Nrcy9kYmxxaC9EYmxxaE1haW4uY3BwCTIwMDktMDctMDMgMjE6MTE6NTkgKzAw
MDANCkBAIC0zNzE5LDcgKzM3MTksOCBAQCBpbnQgRGJscWg6OnNhdmVBdHRySW5m
b0luU2VjdGlvbihjb25zdCBVDQogICAgIHJldHVybiBaR0VUX0FUVFJJTkJVRl9F
UlJPUjsNCiAgIH0vL2lmDQogDQotICByZWdUY1B0ci0+Y3VyclR1cEFpTGVuKz0g
bGVuOw0KKyAgaWYgKHJlZ1RjUHRyLT5tX2ZsYWdzICYgVGNDb25uZWN0aW9ucmVj
OjpPUF9TQVZFQVRUUklORk8pDQorICAgIHJlZ1RjUHRyLT5jdXJyVHVwQWlMZW4g
Kz0gbGVuOw0KICAgDQogICByZXR1cm4gWk9LOw0KIH0gLy8gc2F2ZUF0dHJJbmZv
SW5TZWN0aW9uDQpAQCAtNDM0Nyw3ICs0MzQ4LDYgQEAgdm9pZCBEYmxxaDo6ZXhl
Y0xRSEtFWVJFUShTaWduYWwqIHNpZ25hbA0KICAgaWYgKHNhdmVBdHRySW5mbykN
CiAgICAgcmVnVGNQdHItPm1fZmxhZ3N8PSBUY0Nvbm5lY3Rpb25yZWM6Ok9QX1NB
VkVBVFRSSU5GTzsNCiAgIA0KLSAgDQogICAvKiBIYW5kbGUgYW55IEF0dHJJbmZv
IHdlIHJlY2VpdmVkIHdpdGggdGhlIExRSEtFWVJFUSAqLw0KICAgaWYgKHJlZ1Rj
UHRyLT5jdXJyUmVjbGVuQWkgIT0gMCkNCiAgIHsNCkBAIC00Mzc4LDcgKzQzNzgs
OCBAQCB2b2lkIERibHFoOjpleGVjTFFIS0VZUkVRKFNpZ25hbCogc2lnbmFsDQog
ICAgICAgICByZXR1cm47DQogICAgICAgfQ0KICAgICAgICAgDQotICAgICAgcmVn
VGNQdHItPmN1cnJUdXBBaUxlbj0gVHJlY2xlbkFpTHFoa2V5Ow0KKyAgICAgIGlm
IChzYXZlQXR0ckluZm8pDQorICAgICAgICByZWdUY1B0ci0+Y3VyclR1cEFpTGVu
PSBUcmVjbGVuQWlMcWhrZXk7DQogICAgIH0NCiAgIH0vL2lmDQogDQpAQCAtMTA1
ODAsNyArMTA1ODEsMTAgQEAgdm9pZCBEYmxxaDo6aW5pdFNjYW5UYyhjb25zdCBT
Y2FuRnJhZ1JlcQ0KICAgdGNDb25uZWN0cHRyLnAtPm1fc2Nhbl9jdXJyX3Jhbmdl
X25vID0gMDsNCiAgIHRjQ29ubmVjdHB0ci5wLT5tX2RlYWxsb2MgPSAwOw0KICAg
dGNDb25uZWN0cHRyLnAtPmFjdGl2ZUNyZWF0ID0gRnJhZ3JlY29yZDo6QUNfTk9S
TUFMOw0KLSAgdGNDb25uZWN0cHRyLnAtPm1fZmxhZ3MgPSAwOw0KKyAgLy8gc2V0
IFRjQ29ubmVjdGlvbnJlYzo6T1BfU0FWRUFUVFJJTkZPIHNvIHRoYXQgYQ0KKyAg
Ly8gIm9sZCIgc2NhbiAoc2hvcnQgc2lnbmFscykgdXBkYXRlIGN1cnJUdXBBaUxl
biB3aGljaCBpcyBjaGVja2VkDQorICAvLyBpbiBzY2FuQXR0cmluZm9MYWINCisg
IHRjQ29ubmVjdHB0ci5wLT5tX2ZsYWdzID0gVGNDb25uZWN0aW9ucmVjOjpPUF9T
QVZFQVRUUklORk87DQogICBUYWJsZXJlY1B0ciB0VGFibGVQdHI7DQogICB0VGFi
bGVQdHIuaSA9IHRhYnB0ci5wLT5wcmltYXJ5VGFibGVJZDsNCiAgIHB0ckNoZWNr
R3VhcmQodFRhYmxlUHRyLCBjdGFicmVjRmlsZVNpemUsIHRhYmxlcmVjKTsNCg0K
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvbmRiL3NyYy9tZ21zcnYvQ29uZmln
SW5mby5jcHAnDQotLS0gYS9zdG9yYWdlL25kYi9zcmMvbWdtc3J2L0NvbmZpZ0lu
Zm8uY3BwCTIwMDktMDYtMjYgMTM6MzM6MDEgKzAwMDANCisrKyBiL3N0b3JhZ2Uv
bmRiL3NyYy9tZ21zcnYvQ29uZmlnSW5mby5jcHAJMjAwOS0wNy0wMyAwNjozNDow
MSArMDAwMA0KQEAgLTE5MjcsNiArMTkyNywyMCBAQCBjb25zdCBDb25maWdJbmZv
OjpQYXJhbUluZm8gQ29uZmlnSW5mbzo6DQogICAgIFNUUl9WQUxVRShNQVhfSU5U
X1JOSUwpDQogICB9LA0KIA0KKyAgew0KKyAgICBDRkdfQVVUT19SRUNPTk5FQ1Qs
DQorICAgICJBdXRvUmVjb25uZWN0IiwNCisgICAgIkFQSSIsDQorICAgICJTcGVj
aWZpZXMgaWYgYW4gYXBpIG5vZGUgc2hvdWxkIHJlY29ubmVjdCB3aGVuIGZ1bGx5
IGRpc2Nvbm5lY3RlZCBmcm9tIGNsdXN0ZXIiLA0KKyAgICBDb25maWdJbmZvOjpD
SV9VU0VELA0KKyAgICBmYWxzZSwNCisgICAgQ29uZmlnSW5mbzo6Q0lfQk9PTCwN
CisgICAgInRydWUiLA0KKyAgICAiZmFsc2UiLA0KKyAgICAidHJ1ZSINCisgIH0s
DQorDQorDQogICAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKg0KICAgICog
TUdNDQogICAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0KDQo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9uZGIvc3JjL25kYmFwaS9DbHVzdGVyTWdyLmNw
cCcNCi0tLSBhL3N0b3JhZ2UvbmRiL3NyYy9uZGJhcGkvQ2x1c3Rlck1nci5jcHAJ
MjAwOS0wNi0yOSAyMDo1NjozNyArMDAwMA0KKysrIGIvc3RvcmFnZS9uZGIvc3Jj
L25kYmFwaS9DbHVzdGVyTWdyLmNwcAkyMDA5LTA3LTAzIDIxOjExOjU5ICswMDAw
DQpAQCAtNzUsNiArNzUsNyBAQCBDbHVzdGVyTWdyOjpDbHVzdGVyTWdyKFRyYW5z
cG9ydGVyRmFjYWRlDQogICBuZGJTZXRPd25WZXJzaW9uKCk7DQogICBjbHVzdGVy
TWdyVGhyZWFkTXV0ZXggPSBOZGJNdXRleF9DcmVhdGUoKTsNCiAgIHdhaXRGb3JI
QkNvbmQ9IE5kYkNvbmRpdGlvbl9DcmVhdGUoKTsNCisgIG1fYXV0b19yZWNvbm5l
Y3QgPSAtMTsNCiANCiAgIGludCByZXQgPSBvcGVuKCZ0aGVGYWNhZGUsIEFQSV9D
TFVTVEVSTUdSKTsNCiAgIGFzc2VydChyZXQgPj0gMCk7DQpAQCAtMTcyLDYgKzE3
MywxNyBAQCBDbHVzdGVyTWdyOjpjb25maWd1cmUoVWludDMyIG5vZGVJZCwNCiAg
ICAgZGVsZXRlIHRoZUFyYml0TWdyOw0KICAgICB0aGVBcmJpdE1ncj0gTlVMTDsN
CiAgIH0NCisNCisgIFVpbnQzMiBhdXRvX3JlY29ubmVjdD0xOw0KKyAgaXRlci5n
ZXQoQ0ZHX0FVVE9fUkVDT05ORUNULCAmYXV0b19yZWNvbm5lY3QpOw0KKw0KKyAg
LyoqDQorICAgKiBLZWVwIHZhbHVlIGl0IHNldCBiZWZvcmUgY29ubmVjdCAob3Zl
cnJpZGluZyBjb25maWcpDQorICAgKi8NCisgIGlmIChtX2F1dG9fcmVjb25uZWN0
ID09IC0xKQ0KKyAgew0KKyAgICBtX2F1dG9fcmVjb25uZWN0ID0gYXV0b19yZWNv
bm5lY3Q7DQorICB9DQogfQ0KIA0KIHZvaWQNCkBAIC0xOTAsOCArMjAyLDkgQEAg
dm9pZA0KIENsdXN0ZXJNZ3I6OmRvU3RvcCggKXsNCiAgIERCVUdfRU5URVIoIkNs
dXN0ZXJNZ3I6OmRvU3RvcCIpOw0KICAgR3VhcmQgZyhjbHVzdGVyTWdyVGhyZWFk
TXV0ZXgpOw0KLSAgaWYodGhlU3RvcCkNCisgIGlmKHRoZVN0b3AgPT0gMSl7DQog
ICAgIERCVUdfVk9JRF9SRVRVUk47DQorICB9DQogDQogICB2b2lkICpzdGF0dXM7
DQogICB0aGVTdG9wID0gMTsNCkBAIC03MzIsNiArNzQ1LDExIEBAIENsdXN0ZXJN
Z3I6OnJlcG9ydE5vZGVGYWlsZWQoTm9kZUlkIG5vZGUNCiAgICAgICBtX2Nvbm5l
Y3RfY291bnQgKys7DQogICAgICAgbV9jbHVzdGVyX3N0YXRlID0gQ1Nfd2FpdGlu
Z19mb3JfY2xlYW5fY2FjaGU7DQogICAgIH0NCisNCisgICAgaWYgKG1fYXV0b19y
ZWNvbm5lY3QgPT0gMCkNCisgICAgew0KKyAgICAgIHRoZVN0b3AgPSAyOw0KKyAg
ICB9DQogICB9DQogICB0aGVOb2RlLm5mQ29tcGxldGVSZXAgPSBmYWxzZTsNCiAg
IGlmKG5vT2ZBbGl2ZU5vZGVzID09IDApDQoNCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL25kYi9zcmMvbmRiYXBpL0NsdXN0ZXJNZ3IuaHBwJw0KLS0tIGEvc3Rv
cmFnZS9uZGIvc3JjL25kYmFwaS9DbHVzdGVyTWdyLmhwcAkyMDA5LTA2LTI5IDIw
OjU2OjM3ICswMDAwDQorKysgYi9zdG9yYWdlL25kYi9zcmMvbmRiYXBpL0NsdXN0
ZXJNZ3IuaHBwCTIwMDktMDctMDMgMjE6MTE6NTkgKzAwMDANCkBAIC04Myw2ICs4
Myw3IEBAIHB1YmxpYzoNCiAgIFVpbnQzMiAgICAgICAgZ2V0Tm9PZkNvbm5lY3Rl
ZE5vZGVzKCkgY29uc3Q7DQogICB2b2lkICAgICAgICAgIGhiX3JlY2VpdmVkKE5v
ZGVJZCk7DQogDQorICBpbnQgbV9hdXRvX3JlY29ubmVjdDsNCiAgIFVpbnQzMiAg
ICAgICAgbV9jb25uZWN0X2NvdW50Ow0KIHByaXZhdGU6DQogICBVaW50MzIgICAg
ICAgIG1fbWF4X2FwaV9yZWdfcmVxX2ludGVydmFsOw0KDQo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9uZGIvc3JjL25kYmFwaS9UcmFuc3BvcnRlckZhY2FkZS5j
cHAnDQotLS0gYS9zdG9yYWdlL25kYi9zcmMvbmRiYXBpL1RyYW5zcG9ydGVyRmFj
YWRlLmNwcAkyMDA5LTA2LTI5IDIwOjU2OjM3ICswMDAwDQorKysgYi9zdG9yYWdl
L25kYi9zcmMvbmRiYXBpL1RyYW5zcG9ydGVyRmFjYWRlLmNwcAkyMDA5LTA3LTAz
IDIxOjExOjU5ICswMDAwDQpAQCAtMTY3NCw3ICsxNjc0LDYgQEAgU2lnbmFsU2Vu
ZGVyOjpzZW5kU2lnbmFsKFVpbnQxNiBub2RlSWQsIA0KICAgcmV0dXJuIHNzOw0K
IH0NCiANCi0NCiBVaW50MzIqDQogU2lnbmFsU2VjdGlvbkl0ZXJhdG9yOjpnZXRO
ZXh0V29yZHMoVWludDMyJiBzeikNCiB7DQpAQCAtMTk0MiwzICsxOTQxLDE1IEBA
IGludCBtYWluKGludCBhcmcsIGNoYXIqKiBhcmd2KQ0KICAgcmV0dXJuIDA7DQog
fQ0KICNlbmRpZg0KKw0KK3ZvaWQNCitUcmFuc3BvcnRlckZhY2FkZTo6c2V0X2F1
dG9fcmVjb25uZWN0KGludCB2YWwpDQorew0KKyAgdGhlQ2x1c3Rlck1nci0+bV9h
dXRvX3JlY29ubmVjdCA9IHZhbDsNCit9DQorDQoraW50DQorVHJhbnNwb3J0ZXJG
YWNhZGU6OmdldF9hdXRvX3JlY29ubmVjdCgpIGNvbnN0DQorew0KKyAgcmV0dXJu
IHRoZUNsdXN0ZXJNZ3ItPm1fYXV0b19yZWNvbm5lY3Q7DQorfQ0KDQo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9uZGIvc3JjL25kYmFwaS9UcmFuc3BvcnRlckZh
Y2FkZS5ocHAnDQotLS0gYS9zdG9yYWdlL25kYi9zcmMvbmRiYXBpL1RyYW5zcG9y
dGVyRmFjYWRlLmhwcAkyMDA5LTA2LTI5IDIwOjU2OjM3ICswMDAwDQorKysgYi9z
dG9yYWdlL25kYi9zcmMvbmRiYXBpL1RyYW5zcG9ydGVyRmFjYWRlLmhwcAkyMDA5
LTA3LTAzIDIxOjExOjU5ICswMDAwDQpAQCAtMTM1LDYgKzEzNSw4IEBAIHB1Ymxp
YzoNCiANCiAgIC8vIGhlYXJ0IGJlYXQgcmVjZWl2ZWQgZnJvbSBhIG5vZGUgKGUu
Zy4gYSBzaWduYWwgY2FtZSkNCiAgIHZvaWQgaGJfcmVjZWl2ZWQoTm9kZUlkIG4p
Ow0KKyAgdm9pZCBzZXRfYXV0b19yZWNvbm5lY3QoaW50IHZhbCk7DQorICBpbnQg
Z2V0X2F1dG9fcmVjb25uZWN0KCkgY29uc3Q7DQogDQogICAvKiBUcmFuc3BvcnRl
ckNhbGxiYWNrIGludGVyZmFjZS4gKi8NCiAgIHZvaWQgZGVsaXZlcl9zaWduYWwo
U2lnbmFsSGVhZGVyICogY29uc3QgaGVhZGVyLA0KDQo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9uZGIvc3JjL25kYmFwaS9uZGJfY2x1c3Rlcl9jb25uZWN0aW9u
LmNwcCcNCi0tLSBhL3N0b3JhZ2UvbmRiL3NyYy9uZGJhcGkvbmRiX2NsdXN0ZXJf
Y29ubmVjdGlvbi5jcHAJMjAwOS0wNi0yOSAyMDo1NjozNyArMDAwMA0KKysrIGIv
c3RvcmFnZS9uZGIvc3JjL25kYmFwaS9uZGJfY2x1c3Rlcl9jb25uZWN0aW9uLmNw
cAkyMDA5LTA3LTAzIDIxOjExOjU5ICswMDAwDQpAQCAtODk3LDUgKzg5NywxNyBA
QCBOZGJfY2x1c3Rlcl9jb25uZWN0aW9uX2ltcGw6OmdldFJlY3ZNdXRlDQogICBy
ZXR1cm4gbV90cmFuc3BvcnRlcl9mYWNhZGUtPnRoZU11dGV4UHRyOw0KIH0NCiAN
CitpbnQNCitOZGJfY2x1c3Rlcl9jb25uZWN0aW9uOjpnZXRfYXV0b19yZWNvbm5l
Y3QoKSBjb25zdA0KK3sNCisgIHJldHVybiBtX2ltcGwubV90cmFuc3BvcnRlcl9m
YWNhZGUtPmdldF9hdXRvX3JlY29ubmVjdCgpOw0KK30NCisNCit2b2lkDQorTmRi
X2NsdXN0ZXJfY29ubmVjdGlvbjo6c2V0X2F1dG9fcmVjb25uZWN0KGludCB2YWx1
ZSkNCit7DQorICBtX2ltcGwubV90cmFuc3BvcnRlcl9mYWNhZGUtPnNldF9hdXRv
X3JlY29ubmVjdCh2YWx1ZSk7DQorfQ0KKw0KIHRlbXBsYXRlIGNsYXNzIFZlY3Rv
cjxOZGJfY2x1c3Rlcl9jb25uZWN0aW9uX2ltcGw6Ok5vZGU+Ow0KIA0KDQo=

--Boundary_(ID_JasQWnUonkPSre7Kf92Elg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/jonas@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/jonas@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-7.1/
# testament_sha1: 82532dc437231b6b7c765702ee5a3383c90090f9
# timestamp: 2009-07-03 23:39:16 +0200
# source_branch: file:///home/jonas/src/71-local/
# base_revision_id: magnus.blaudd@stripped\
#   hwnne8g7v3mnstkf
# 
# Begin bundle
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


--Boundary_(ID_JasQWnUonkPSre7Kf92Elg)--