From: Bjorn Munch
Date: March 30 2011 12:06pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2990)
List-Archive: http://lists.mysql.com/commits/134247
Message-Id: <201103301206.p2UC6XV9024694@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1908233761=="

--===============1908233761==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

I0F0IGZpbGU6Ly8vaG9tZS9ibTEzNjgwMS9teS9zdXBwLTUxLyBiYXNlZCBvbiByZXZpZDpiam9y
bi5tdW5jaEBvcmFjbGUuY29tLTIwMTEwMzIyMTQzODQxLTFjbzNpNGM2NHRvb3VleWcKCiAyOTkw
IEJqb3JuIE11bmNoCTIwMTEtMDMtMzAKICAgICAgbXRyOiBjbGVhbmVkIHVwIHNvbWUgc3VwZXJm
bHVvcyBnbG9iYWwgd2FybmluZyBzdXBwcmVzc2lvbnMKCiAgICBtb2RpZmllZDoKICAgICAgbXlz
cWwtdGVzdC9leHRyYS9ycGxfdGVzdHMvcnBsX2V4dHJhX2NvbF9tYXN0ZXIudGVzdAogICAgICBt
eXNxbC10ZXN0L2luY2x1ZGUvbWl4MS5pbmMKICAgICAgbXlzcWwtdGVzdC9pbmNsdWRlL210cl93
YXJuaW5ncy5zcWwKICAgICAgbXlzcWwtdGVzdC9yL2N0eXBlX2NwOTMyX2JpbmxvZ19zdG0ucmVz
dWx0CiAgICAgIG15c3FsLXRlc3Qvci9vcmRlcl9ieS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9y
L3Nob3dfY2hlY2sucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9zcC1kZXN0cnVjdC5yZXN1bHQK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfZXh0cmFfY29sX21hc3Rlcl9pbm5vZGIu
cmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX2V4dHJhX2NvbF9tYXN0ZXJf
bXlpc2FtLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3QvY3R5cGVfY3A5MzJfYmlubG9nX3N0bS50
ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9vcmRlcl9ieS50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC9z
aG93X2NoZWNrLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L3NwLWRlc3RydWN0LnRlc3QKPT09IG1v
ZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvZXh0cmEvcnBsX3Rlc3RzL3JwbF9leHRyYV9jb2xfbWFz
dGVyLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvZXh0cmEvcnBsX3Rlc3RzL3JwbF9leHRyYV9jb2xf
bWFzdGVyLnRlc3QJMjAxMS0wMi0yMyAwOTozMTozNyArMDAwMAorKysgYi9teXNxbC10ZXN0L2V4
dHJhL3JwbF90ZXN0cy9ycGxfZXh0cmFfY29sX21hc3Rlci50ZXN0CTIwMTEtMDMtMzAgMTI6MDY6
MjIgKzAwMDAKQEAgLTEyMyw5ICsxMjMsOSBAQCBTRUxFQ1QgZjEsZjIsZjMsZjQsZjUsZjYsZjcs
ZjgsZjksCiAjY29ubmVjdGlvbiBzbGF2ZTsKIAogY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJT
bGF2ZSBTUUwuKlRhYmxlIGRlZmluaXRpb24gb24gbWFzdGVyIGFuZCBzbGF2ZSBkb2VzIG5vdCBt
YXRjaDogQ29sdW1uIDIgdHlwZSBtaXNtYXRjaC4qIDE1MzUiKTsKLWNhbGwgbXRyLmFkZF9zdXBw
cmVzc2lvbigiU2xhdmUgU1FMLipFcnJvciAuQ2FuLnQgRFJPUCAuYzcuOyBjaGVjayB0aGF0IGNv
bHVtbi5rZXkgZXhpc3RzLiBvbiBxdWVyeS4qIDEwOTEiKTsKLWNhbGwgbXRyLmFkZF9zdXBwcmVz
c2lvbigiU2xhdmUgU1FMLipFcnJvciAuVW5rbm93biBjb2x1bW4gLmM3LiBpbiAudDE1Li4gb24g
cXVlcnkuKiAxMDU0Iik7Ci1jYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIlNsYXZlIFNRTC4qRXJy
b3IgLktleSBjb2x1bW4gLmM2LiBkb2Vzbi50IGV4aXN0IGluIHRhYmxlLiBvbiBxdWVyeS4qIDEw
NzIiKTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUuKkNhbi50IERST1AgLmM3Ljsg
Y2hlY2sgdGhhdCBjb2x1bW4ua2V5IGV4aXN0cy4qIEVycm9yX2NvZGU6IDEwOTEiKTsKK2NhbGwg
bXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUuKlVua25vd24gY29sdW1uIC5jNy4gaW4gLnQxNS4q
IEVycm9yX2NvZGU6IDEwNTQiKTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUuKktl
eSBjb2x1bW4gLmM2LiBkb2Vzbi50IGV4aXN0IGluIHRhYmxlLiogRXJyb3JfY29kZTogMTA3MiIp
OwogCiBzeW5jX3NsYXZlX3dpdGhfbWFzdGVyOwogLS1lY2hvCgo9PT0gbW9kaWZpZWQgZmlsZSAn
bXlzcWwtdGVzdC9pbmNsdWRlL21peDEuaW5jJwotLS0gYS9teXNxbC10ZXN0L2luY2x1ZGUvbWl4
MS5pbmMJMjAxMC0xMi0wOCAxNDoyMTowMyArMDAwMAorKysgYi9teXNxbC10ZXN0L2luY2x1ZGUv
bWl4MS5pbmMJMjAxMS0wMy0zMCAxMjowNjoyMiArMDAwMApAQCAtNjM0LDYgKzYzNCwxMCBAQCBk
cm9wIHRhYmxlIHQxOwogZHJvcCB0YWJsZSBidWcyOTgwNzsKIGNyZWF0ZSB0YWJsZSBidWcyOTgw
NyAoYSBpbnQpOwogZHJvcCB0YWJsZSBidWcyOTgwNzsKKy0tZGlzYWJsZV9xdWVyeV9sb2cKK2Nh
bGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiSW5ub0RCOiBFcnJvcjogdGFibGUgLnRlc3QuLi5idWcy
OTgwNy4gZG9lcyBub3QgZXhpc3QgaW4gdGhlIElubm9EQiBpbnRlcm5hbCIpOworY2FsbCBtdHIu
YWRkX3N1cHByZXNzaW9uKCJDYW5ub3QgZmluZCBvciBvcGVuIHRhYmxlIHRlc3RcL2J1ZzI5ODA3
IGZyb20iKTsKKy0tZW5hYmxlX3F1ZXJ5X2xvZwogCiAKICMKCj09PSBtb2RpZmllZCBmaWxlICdt
eXNxbC10ZXN0L2luY2x1ZGUvbXRyX3dhcm5pbmdzLnNxbCcKLS0tIGEvbXlzcWwtdGVzdC9pbmNs
dWRlL210cl93YXJuaW5ncy5zcWwJMjAxMS0wMi0yMyAwOTozMTozNyArMDAwMAorKysgYi9teXNx
bC10ZXN0L2luY2x1ZGUvbXRyX3dhcm5pbmdzLnNxbAkyMDExLTAzLTMwIDEyOjA2OjIyICswMDAw
CkBAIC0xMTAsNyArMTEwLDYgQEAgSU5TRVJUIElOVE8gZ2xvYmFsX3N1cHByZXNzaW9ucyBWQUxV
RVMKICAoIlNvcnQgYWJvcnRlZCIpLAogICgiVGltZS1vdXQgaW4gTkRCIiksCiAgKCJXYXJuaW5n
OlxzK09uZSBjYW4gb25seSB1c2UgdGhlIC0tdXNlci4qcm9vdCIpLAotICgiV2FybmluZzpccytT
ZXR0aW5nIGxvd2VyX2Nhc2VfdGFibGVfbmFtZXM9MiIpLAogICgiV2FybmluZzpccytUYWJsZTou
KiBvbiAoZGVsZXRlfHJlbmFtZSkiKSwKICAoIllvdSBoYXZlIGFuIGVycm9yIGluIHlvdXIgU1FM
IHN5bnRheCIpLAogICgiZGVwcmVjYXRlZCIpLApAQCAtMTIzLDU1ICsxMjIsMjIgQEAgSU5TRVJU
IElOVE8gZ2xvYmFsX3N1cHByZXNzaW9ucyBWQUxVRVMKICAoInNsYXZlIFNRTCB0aHJlYWQgYWJv
cnRlZCIpLAogICgiU2xhdmU6IC4qRHVwbGljYXRlIGVudHJ5IiksCiAKLSAvKgotICAgU3BlY2lh
bCBjYXNlLCBtYWRlIGFzIHNwZWNpZmljIGFzIHBvc3NpYmxlLCBmb3I6Ci0gICBCdWcgIzI4NDM2
OiBJbmNvcnJlY3QgcG9zaXRpb24gaW4gU0hPVyBCSU5MT0cgRVZFTlRTIGNhdXNlcwotICAgc2Vy
dmVyIGNvcmVkdW1wCi0gKi8KLQotICgiRXJyb3IgaW4gTG9nX2V2ZW50OjpyZWFkX2xvZ19ldmVu
dFxcXChcXFwpOiAnU2FuaXR5IGNoZWNrIGZhaWxlZCcsIGRhdGFfbGVuOiAyNTgsIGV2ZW50X3R5
cGU6IDQ5IiksCi0KICAoIlN0YXRlbWVudCBtYXkgbm90IGJlIHNhZmUgdG8gbG9nIGluIHN0YXRl
bWVudCBmb3JtYXQiKSwKIAotIC8qIHRlc3QgY2FzZSBmb3IgQnVnI2J1ZzI5ODA3IGNvcGllcyBh
IHN0cmF5IGZybSBpbnRvIGRhdGFiYXNlICovCi0gKCJJbm5vREI6IEVycm9yOiB0YWJsZSBgdGVz
dGAuYGJ1ZzI5ODA3YCBkb2VzIG5vdCBleGlzdCBpbiB0aGUgSW5ub0RCIGludGVybmFsIiksCi0g
KCJDYW5ub3QgZmluZCBvciBvcGVuIHRhYmxlIHRlc3RcL2J1ZzI5ODA3IGZyb20iKSwKLQogIC8q
IGlubm9kYiBmb3JlaWduIGtleSB0ZXN0cyB0aGF0IGZhaWwgaW4gQUxURVIgb3IgUkVOQU1FIHBy
b2R1Y2UgdGhpcyAqLwogICgiSW5ub0RCOiBFcnJvcjogaW4gQUxURVIgVEFCTEUgYHRlc3RgLmB0
WzEyM11gIiksCiAgKCJJbm5vREI6IEVycm9yOiBpbiBSRU5BTUUgVEFCTEUgdGFibGUgYHRlc3Rg
LmB0MWAiKSwKICAoIklubm9EQjogRXJyb3I6IHRhYmxlIGB0ZXN0YC5gdFsxMjNdYCBkb2VzIG5v
dCBleGlzdCBpbiB0aGUgSW5ub0RCIGludGVybmFsIiksCiAKLSAvKiBUZXN0IGNhc2UgZm9yIEJ1
ZyMxNDIzMyBwcm9kdWNlcyB0aGUgZm9sbG93aW5nIHdhcm5pbmdzOiAqLwotICgiU3RvcmVkIHJv
dXRpbmUgJ3Rlc3QnLididWcxNDIzM18xJzogaW52YWxpZCB2YWx1ZSBpbiBjb2x1bW4gbXlzcWwu
cHJvYyIpLAotICgiU3RvcmVkIHJvdXRpbmUgJ3Rlc3QnLididWcxNDIzM18yJzogaW52YWxpZCB2
YWx1ZSBpbiBjb2x1bW4gbXlzcWwucHJvYyIpLAotICgiU3RvcmVkIHJvdXRpbmUgJ3Rlc3QnLidi
dWcxNDIzM18zJzogaW52YWxpZCB2YWx1ZSBpbiBjb2x1bW4gbXlzcWwucHJvYyIpLAotCiAgLyoK
ICAgIEJVRyMzMjA4MCAtIEV4Y2Vzc2l2ZSB3YXJuaW5ncyBvbiBTb2xhcmlzOiBzZXRybGltaXQg
Y291bGQgbm90CiAgICBjaGFuZ2UgdGhlIHNpemUgb2YgY29yZSBmaWxlcwogICAqLwogICgic2V0
cmxpbWl0IGNvdWxkIG5vdCBjaGFuZ2UgdGhlIHNpemUgb2YgY29yZSBmaWxlcyB0byAnaW5maW5p
dHknIiksCiAKLSAvKgotICAgcnBsX2V4dHJDb2xtYXN0ZXJfKi50ZXN0LCB0aGUgc2xhdmUgdGhy
ZWFkIHByb2R1Y2VzIHdhcm5pbmdzCi0gICB3aGVuIGl0IGdldCB1cGRhdGVzIHRvIGEgdGFibGUg
dGhhdCBoYXMgbW9yZSBjb2x1bW5zIG9uIHRoZQotICAgbWFzdGVyCi0gICovCi0gKCJTbGF2ZTog
VW5rbm93biBjb2x1bW4gJ2M3JyBpbiAndDE1JyBFcnJvcl9jb2RlOiAxMDU0IiksCi0gKCJTbGF2
ZTogQ2FuJ3QgRFJPUCAnYzcnLiogMTA5MSIpLAotICgiU2xhdmU6IEtleSBjb2x1bW4gJ2M2Jy4q
IDEwNzIiKSwKICAoIlRoZSBzbGF2ZSBJLk8gdGhyZWFkIHN0b3BzIGJlY2F1c2UgYSBmYXRhbCBl
cnJvciBpcyBlbmNvdW50ZXJlZCB3aGVuIGl0IHRyeSB0byBnZXQgdGhlIHZhbHVlIG9mIFNFUlZF
Ul9JRCB2YXJpYWJsZSBmcm9tIG1hc3Rlci4iKSwKICAoIi5TRUxFQ1QgVU5JWF9USU1FU1RBTVAu
Li4gZmFpbGVkIG9uIG1hc3RlciwgZG8gbm90IHRydXN0IGNvbHVtbiBTZWNvbmRzX0JlaGluZF9N
YXN0ZXIgb2YgU0hPVyBTTEFWRSBTVEFUVVMiKSwKIAotIC8qIFRlc3QgY2FzZSBmb3IgQnVnIzMx
NTkwIGluIG9yZGVyX2J5LnRlc3QgcHJvZHVjZXMgdGhlIGZvbGxvd2luZyBlcnJvciAqLwotICgi
T3V0IG9mIHNvcnQgbWVtb3J5OyBpbmNyZWFzZSBzZXJ2ZXIgc29ydCBidWZmZXIgc2l6ZSIpLAot
Ci0gLyogU3BlY2lhbCBjYXNlIGZvciBCdWcgIzI2NDAyIGluIHNob3dfY2hlY2sudGVzdAotICAg
IC0gUXVlc3Rpb24gbWFya3MgYXJlIG5vdCB2YWxpZCBmaWxlIG5hbWUgcGFydHMgb24gV2luZG93
cy4gSWdub3JlCi0gICAgICB0aGlzIGVycm9yIG1lc3NhZ2UuCi0gICovCi0gKCJDYW4ndCBmaW5k
IGZpbGU6ICcuXFxcXHRlc3RcXFxcXFw/ezh9LmZybSciKSwKICAoIlNsYXZlOiBVbmtub3duIHRh
YmxlICd0MScgRXJyb3JfY29kZTogMTA1MSIpLAogCiAgLyogTWVzc2FnZXMgZnJvbSB2YWxncmlu
ZCAqLwpAQCAtMTg5LDE1ICsxNTUsNiBAQCBJTlNFUlQgSU5UTyBnbG9iYWxfc3VwcHJlc3Npb25z
IFZBTFVFUwogICgiPT1bMC05XSo9PSBXYXJuaW5nOiBpbnZhbGlkIGZpbGUgZGVzY3JpcHRvciAt
MSBpbiBzeXNjYWxsIHdyaXRlKCkiKSwKICAoIj09WzAtOV0qPT0gV2FybmluZzogaW52YWxpZCBm
aWxlIGRlc2NyaXB0b3IgLTEgaW4gc3lzY2FsbCByZWFkKCkiKSwKIAotIC8qCi0gICBUcmFuc2ll
bnQgbmV0d29yayBmYWlsdXJlcyB0aGF0IGNhdXNlIHdhcm5pbmdzIG9uIHJlY29ubmVjdC4KLSAg
IEJVRyM0Nzc0MyBhbmQgQlVHIzQ3OTgzLgotICovCi0gKCJTbGF2ZSBJL086IEdldCBtYXN0ZXIg
U0VSVkVSX0lEIGZhaWxlZCB3aXRoIGVycm9yOi4qIiksCi0gKCJTbGF2ZSBJL086IEdldCBtYXN0
ZXIgY2xvY2sgZmFpbGVkIHdpdGggZXJyb3I6LioiKSwKLSAoIlNsYXZlIEkvTzogR2V0IG1hc3Rl
ciBDT0xMQVRJT05fU0VSVkVSIGZhaWxlZCB3aXRoIGVycm9yOi4qIiksCi0gKCJTbGF2ZSBJL086
IEdldCBtYXN0ZXIgVElNRV9aT05FIGZhaWxlZCB3aXRoIGVycm9yOi4qIiksCi0KICAoIlRIRV9M
QVNUX1NVUFBSRVNTSU9OIil8fAogCiAKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3Iv
Y3R5cGVfY3A5MzJfYmlubG9nX3N0bS5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9jdHlwZV9j
cDkzMl9iaW5sb2dfc3RtLnJlc3VsdAkyMDEwLTA1LTI0IDEzOjU0OjA4ICswMDAwCisrKyBiL215
c3FsLXRlc3Qvci9jdHlwZV9jcDkzMl9iaW5sb2dfc3RtLnJlc3VsdAkyMDExLTAzLTMwIDEyOjA2
OjIyICswMDAwCkBAIC00NCw2ICs0NCw3IEBAIG1hc3Rlci1iaW4uMDAwMDAxCSMJUXVlcnkJIwkj
CXVzZSBgdGVzdGAKIG1hc3Rlci1iaW4uMDAwMDAxCSMJUXVlcnkJIwkjCXVzZSBgdGVzdGA7IERS
T1AgUFJPQ0VEVVJFIGJ1ZzE4MjkzCiBtYXN0ZXItYmluLjAwMDAwMQkjCVF1ZXJ5CSMJIwl1c2Ug
YHRlc3RgOyBEUk9QIFRBQkxFIHQ0CiBFbmQgb2YgNS4wIHRlc3RzCitjYWxsIG10ci5hZGRfc3Vw
cHJlc3Npb24oIkVycm9yIGluIExvZ19ldmVudDo6cmVhZF9sb2dfZXZlbnRcXFwoXFxcKTogJ1Nh
bml0eSBjaGVjayBmYWlsZWQnLCBkYXRhX2xlbjogMjU4LCBldmVudF90eXBlOiA0OSIpOwogU0hP
VyBCSU5MT0cgRVZFTlRTIEZST00gMzY1OwogRVJST1IgSFkwMDA6IEVycm9yIHdoZW4gZXhlY3V0
aW5nIGNvbW1hbmQgU0hPVyBCSU5MT0cgRVZFTlRTOiBXcm9uZyBvZmZzZXQgb3IgSS9PIGVycm9y
CiBCdWcjNDQzNTIgVVBQRVIvTE9XRVIgZnVuY3Rpb24gZG9lc24ndCB3b3JrIGNvcnJlY3RseSBv
biBjcDkzMiBhbmQgc2ppcyBlbnZpcm9ubWVudC4KCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10
ZXN0L3Ivb3JkZXJfYnkucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3Ivb3JkZXJfYnkucmVzdWx0
CTIwMTEtMDItMDcgMDk6MzY6MjEgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9yL29yZGVyX2J5LnJl
c3VsdAkyMDExLTAzLTMwIDEyOjA2OjIyICswMDAwCkBAIC0xNDI4LDYgKzE0MjgsNyBAQCBzZXQg
c2Vzc2lvbiBtYXhfc29ydF9sZW5ndGg9IDIxODA7CiBzZWxlY3QgKiBmcm9tIHQxIG9yZGVyIGJ5
IGI7CiBFUlJPUiBIWTAwMTogT3V0IG9mIHNvcnQgbWVtb3J5OyBpbmNyZWFzZSBzZXJ2ZXIgc29y
dCBidWZmZXIgc2l6ZQogZHJvcCB0YWJsZSB0MTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigi
T3V0IG9mIHNvcnQgbWVtb3J5OyBpbmNyZWFzZSBzZXJ2ZXIgc29ydCBidWZmZXIgc2l6ZSIpOwog
IwogIyBCdWcgIzM5ODQ0OiBRdWVyeSBDcmFzaCBNeXNxbCBTZXJ2ZXIgNS4wLjY3CiAjCgo9PT0g
bW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL3Nob3dfY2hlY2sucmVzdWx0JwotLS0gYS9teXNx
bC10ZXN0L3Ivc2hvd19jaGVjay5yZXN1bHQJMjAxMC0xMS0zMCAxNzo1MToyNSArMDAwMAorKysg
Yi9teXNxbC10ZXN0L3Ivc2hvd19jaGVjay5yZXN1bHQJMjAxMS0wMy0zMCAxMjowNjoyMiArMDAw
MApAQCAtMTMzOSw2ICsxMzM5LDcgQEAgZHJvcCB0YWJsZSBg77+977+9dO+/ve+/vWA7CiBzZXQg
bmFtZXMgbGF0aW4xOwogc2hvdyBjb2x1bW5zIGZyb20gYCNteXNxbDUwIz8/Pz8/Pz8/YDsKIEdv
dCBvbmUgb2YgdGhlIGxpc3RlZCBlcnJvcnMKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiQ2Fu
LnQgZmluZCBmaWxlOiAnLlxcXFx0ZXN0XFxcXFxcP3s4fS5mcm0nIik7CiBEUk9QIFRBQkxFIElG
IEVYSVNUUyB0MTsKIERST1AgUFJPQ0VEVVJFIElGIEVYSVNUUyBwMTsKIENSRUFURSBUQUJMRSB0
MShjMSBJTlQpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9zcC1kZXN0cnVjdC5y
ZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9zcC1kZXN0cnVjdC5yZXN1bHQJMjAwOS0xMS0yMSAx
MToxODoyMSArMDAwMAorKysgYi9teXNxbC10ZXN0L3Ivc3AtZGVzdHJ1Y3QucmVzdWx0CTIwMTEt
MDMtMzAgMTI6MDY6MjIgKzAwMDAKQEAgLTEsNCArMSw1IEBACiBjYWxsIG10ci5hZGRfc3VwcHJl
c3Npb24oIkNvbHVtbiBjb3VudCBvZiBteXNxbC5wcm9jIGlzIHdyb25nLiBFeHBlY3RlZCAyMCwg
Zm91bmQgMTkuIFRoZSB0YWJsZSBpcyBwcm9iYWJseSBjb3JydXB0ZWQiKTsKK2NhbGwgbXRyLmFk
ZF9zdXBwcmVzc2lvbigiU3RvcmVkIHJvdXRpbmUgLnRlc3QuLi5idWcxNDIzM19bMTIzXS46IGlu
dmFsaWQgdmFsdWUgaW4gY29sdW1uIG15c3FsLnByb2MiKTsKIHVzZSB0ZXN0OwogZHJvcCBwcm9j
ZWR1cmUgaWYgZXhpc3RzIGJ1ZzE0MjMzOwogZHJvcCBmdW5jdGlvbiBpZiBleGlzdHMgYnVnMTQy
MzM7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfZXh0cmFf
Y29sX21hc3Rlcl9pbm5vZGIucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL3JwbC9yL3Jw
bF9leHRyYV9jb2xfbWFzdGVyX2lubm9kYi5yZXN1bHQJMjAxMS0wMi0yMyAwOTozMTozNyArMDAw
MAorKysgYi9teXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9leHRyYV9jb2xfbWFzdGVyX2lubm9k
Yi5yZXN1bHQJMjAxMS0wMy0zMCAxMjowNjoyMiArMDAwMApAQCAtNTksOSArNTksOSBAQCBmMQlm
MglmMwlmNAlmNQlmNglmNwlmOAlmOQloZXgoZjEwKQloZXgoCiAyOQkyOQkyOQlzZWNvbmQJMglr
YWtzCTIJZ290IHN0b2xlbiBmcm9tIHRoZSBwYXJhZGlzZQl2ZXJ5IGZhdCBibG9iCTE1NTUJMTIz
NDU2CiAzMAkzMAkzMAluZXh0CTIJa2FrcwkyCWdvdCBzdG9sZW4gZnJvbSB0aGUgcGFyYWRpc2UJ
dmVyeSBmYXQgYmxvYgkxNTU1CTEyMzQ1NgogY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJTbGF2
ZSBTUUwuKlRhYmxlIGRlZmluaXRpb24gb24gbWFzdGVyIGFuZCBzbGF2ZSBkb2VzIG5vdCBtYXRj
aDogQ29sdW1uIDIgdHlwZSBtaXNtYXRjaC4qIDE1MzUiKTsKLWNhbGwgbXRyLmFkZF9zdXBwcmVz
c2lvbigiU2xhdmUgU1FMLipFcnJvciAuQ2FuLnQgRFJPUCAuYzcuOyBjaGVjayB0aGF0IGNvbHVt
bi5rZXkgZXhpc3RzLiBvbiBxdWVyeS4qIDEwOTEiKTsKLWNhbGwgbXRyLmFkZF9zdXBwcmVzc2lv
bigiU2xhdmUgU1FMLipFcnJvciAuVW5rbm93biBjb2x1bW4gLmM3LiBpbiAudDE1Li4gb24gcXVl
cnkuKiAxMDU0Iik7Ci1jYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIlNsYXZlIFNRTC4qRXJyb3Ig
LktleSBjb2x1bW4gLmM2LiBkb2Vzbi50IGV4aXN0IGluIHRhYmxlLiBvbiBxdWVyeS4qIDEwNzIi
KTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUuKkNhbi50IERST1AgLmM3LjsgY2hl
Y2sgdGhhdCBjb2x1bW4ua2V5IGV4aXN0cy4qIEVycm9yX2NvZGU6IDEwOTEiKTsKK2NhbGwgbXRy
LmFkZF9zdXBwcmVzc2lvbigiU2xhdmUuKlVua25vd24gY29sdW1uIC5jNy4gaW4gLnQxNS4qIEVy
cm9yX2NvZGU6IDEwNTQiKTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUuKktleSBj
b2x1bW4gLmM2LiBkb2Vzbi50IGV4aXN0IGluIHRhYmxlLiogRXJyb3JfY29kZTogMTA3MiIpOwog
CiAqIFNlbGVjdCBjb3VudCBhbmQgMjAgcm93cyBmcm9tIFNsYXZlICoKIApAQCAtOTM0LDkgKzkz
NCw5IEBAIGYxCWYyCWYzCWY0CWY1CWY2CWY3CWY4CWY5CWhleChmMTApCWhleCgKIDI5CTI5CTI5
CXNlY29uZAkyCWtha3MJMglnb3Qgc3RvbGVuIGZyb20gdGhlIHBhcmFkaXNlCXZlcnkgZmF0IGJs
b2IJMTU1NQkxMjM0NTYKIDMwCTMwCTMwCW5leHQJMglrYWtzCTIJZ290IHN0b2xlbiBmcm9tIHRo
ZSBwYXJhZGlzZQl2ZXJ5IGZhdCBibG9iCTE1NTUJMTIzNDU2CiBjYWxsIG10ci5hZGRfc3VwcHJl
c3Npb24oIlNsYXZlIFNRTC4qVGFibGUgZGVmaW5pdGlvbiBvbiBtYXN0ZXIgYW5kIHNsYXZlIGRv
ZXMgbm90IG1hdGNoOiBDb2x1bW4gMiB0eXBlIG1pc21hdGNoLiogMTUzNSIpOwotY2FsbCBtdHIu
YWRkX3N1cHByZXNzaW9uKCJTbGF2ZSBTUUwuKkVycm9yIC5DYW4udCBEUk9QIC5jNy47IGNoZWNr
IHRoYXQgY29sdW1uLmtleSBleGlzdHMuIG9uIHF1ZXJ5LiogMTA5MSIpOwotY2FsbCBtdHIuYWRk
X3N1cHByZXNzaW9uKCJTbGF2ZSBTUUwuKkVycm9yIC5Vbmtub3duIGNvbHVtbiAuYzcuIGluIC50
MTUuLiBvbiBxdWVyeS4qIDEwNTQiKTsKLWNhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUg
U1FMLipFcnJvciAuS2V5IGNvbHVtbiAuYzYuIGRvZXNuLnQgZXhpc3QgaW4gdGFibGUuIG9uIHF1
ZXJ5LiogMTA3MiIpOworY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJTbGF2ZS4qQ2FuLnQgRFJP
UCAuYzcuOyBjaGVjayB0aGF0IGNvbHVtbi5rZXkgZXhpc3RzLiogRXJyb3JfY29kZTogMTA5MSIp
OworY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJTbGF2ZS4qVW5rbm93biBjb2x1bW4gLmM3LiBp
biAudDE1LiogRXJyb3JfY29kZTogMTA1NCIpOworY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJT
bGF2ZS4qS2V5IGNvbHVtbiAuYzYuIGRvZXNuLnQgZXhpc3QgaW4gdGFibGUuKiBFcnJvcl9jb2Rl
OiAxMDcyIik7CiAKICogU2VsZWN0IGNvdW50IGFuZCAyMCByb3dzIGZyb20gU2xhdmUgKgogCkBA
IC0xODA5LDkgKzE4MDksOSBAQCBmMQlmMglmMwlmNAlmNQlmNglmNwlmOAlmOQloZXgoZjEwKQlo
ZXgoCiAyOQkyOQkyOQlzZWNvbmQJMglrYWtzCTIJZ290IHN0b2xlbiBmcm9tIHRoZSBwYXJhZGlz
ZQl2ZXJ5IGZhdCBibG9iCTE1NTUJMTIzNDU2CiAzMAkzMAkzMAluZXh0CTIJa2FrcwkyCWdvdCBz
dG9sZW4gZnJvbSB0aGUgcGFyYWRpc2UJdmVyeSBmYXQgYmxvYgkxNTU1CTEyMzQ1NgogY2FsbCBt
dHIuYWRkX3N1cHByZXNzaW9uKCJTbGF2ZSBTUUwuKlRhYmxlIGRlZmluaXRpb24gb24gbWFzdGVy
IGFuZCBzbGF2ZSBkb2VzIG5vdCBtYXRjaDogQ29sdW1uIDIgdHlwZSBtaXNtYXRjaC4qIDE1MzUi
KTsKLWNhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUgU1FMLipFcnJvciAuQ2FuLnQgRFJP
UCAuYzcuOyBjaGVjayB0aGF0IGNvbHVtbi5rZXkgZXhpc3RzLiBvbiBxdWVyeS4qIDEwOTEiKTsK
LWNhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUgU1FMLipFcnJvciAuVW5rbm93biBjb2x1
bW4gLmM3LiBpbiAudDE1Li4gb24gcXVlcnkuKiAxMDU0Iik7Ci1jYWxsIG10ci5hZGRfc3VwcHJl
c3Npb24oIlNsYXZlIFNRTC4qRXJyb3IgLktleSBjb2x1bW4gLmM2LiBkb2Vzbi50IGV4aXN0IGlu
IHRhYmxlLiBvbiBxdWVyeS4qIDEwNzIiKTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xh
dmUuKkNhbi50IERST1AgLmM3LjsgY2hlY2sgdGhhdCBjb2x1bW4ua2V5IGV4aXN0cy4qIEVycm9y
X2NvZGU6IDEwOTEiKTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUuKlVua25vd24g
Y29sdW1uIC5jNy4gaW4gLnQxNS4qIEVycm9yX2NvZGU6IDEwNTQiKTsKK2NhbGwgbXRyLmFkZF9z
dXBwcmVzc2lvbigiU2xhdmUuKktleSBjb2x1bW4gLmM2LiBkb2Vzbi50IGV4aXN0IGluIHRhYmxl
LiogRXJyb3JfY29kZTogMTA3MiIpOwogCiAqIFNlbGVjdCBjb3VudCBhbmQgMjAgcm93cyBmcm9t
IFNsYXZlICoKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBs
X2V4dHJhX2NvbF9tYXN0ZXJfbXlpc2FtLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9y
cGwvci9ycGxfZXh0cmFfY29sX21hc3Rlcl9teWlzYW0ucmVzdWx0CTIwMTEtMDItMjMgMDk6MzE6
MzcgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfZXh0cmFfY29sX21hc3Rl
cl9teWlzYW0ucmVzdWx0CTIwMTEtMDMtMzAgMTI6MDY6MjIgKzAwMDAKQEAgLTU5LDkgKzU5LDkg
QEAgZjEJZjIJZjMJZjQJZjUJZjYJZjcJZjgJZjkJaGV4KGYxMCkJaGV4KAogMjkJMjkJMjkJc2Vj
b25kCTIJa2FrcwkyCWdvdCBzdG9sZW4gZnJvbSB0aGUgcGFyYWRpc2UJdmVyeSBmYXQgYmxvYgkx
NTU1CTEyMzQ1NgogMzAJMzAJMzAJbmV4dAkyCWtha3MJMglnb3Qgc3RvbGVuIGZyb20gdGhlIHBh
cmFkaXNlCXZlcnkgZmF0IGJsb2IJMTU1NQkxMjM0NTYKIGNhbGwgbXRyLmFkZF9zdXBwcmVzc2lv
bigiU2xhdmUgU1FMLipUYWJsZSBkZWZpbml0aW9uIG9uIG1hc3RlciBhbmQgc2xhdmUgZG9lcyBu
b3QgbWF0Y2g6IENvbHVtbiAyIHR5cGUgbWlzbWF0Y2guKiAxNTM1Iik7Ci1jYWxsIG10ci5hZGRf
c3VwcHJlc3Npb24oIlNsYXZlIFNRTC4qRXJyb3IgLkNhbi50IERST1AgLmM3LjsgY2hlY2sgdGhh
dCBjb2x1bW4ua2V5IGV4aXN0cy4gb24gcXVlcnkuKiAxMDkxIik7Ci1jYWxsIG10ci5hZGRfc3Vw
cHJlc3Npb24oIlNsYXZlIFNRTC4qRXJyb3IgLlVua25vd24gY29sdW1uIC5jNy4gaW4gLnQxNS4u
IG9uIHF1ZXJ5LiogMTA1NCIpOwotY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJTbGF2ZSBTUUwu
KkVycm9yIC5LZXkgY29sdW1uIC5jNi4gZG9lc24udCBleGlzdCBpbiB0YWJsZS4gb24gcXVlcnku
KiAxMDcyIik7CitjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIlNsYXZlLipDYW4udCBEUk9QIC5j
Ny47IGNoZWNrIHRoYXQgY29sdW1uLmtleSBleGlzdHMuKiBFcnJvcl9jb2RlOiAxMDkxIik7Citj
YWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIlNsYXZlLipVbmtub3duIGNvbHVtbiAuYzcuIGluIC50
MTUuKiBFcnJvcl9jb2RlOiAxMDU0Iik7CitjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIlNsYXZl
LipLZXkgY29sdW1uIC5jNi4gZG9lc24udCBleGlzdCBpbiB0YWJsZS4qIEVycm9yX2NvZGU6IDEw
NzIiKTsKIAogKiBTZWxlY3QgY291bnQgYW5kIDIwIHJvd3MgZnJvbSBTbGF2ZSAqCiAKQEAgLTkz
NCw5ICs5MzQsOSBAQCBmMQlmMglmMwlmNAlmNQlmNglmNwlmOAlmOQloZXgoZjEwKQloZXgoCiAy
OQkyOQkyOQlzZWNvbmQJMglrYWtzCTIJZ290IHN0b2xlbiBmcm9tIHRoZSBwYXJhZGlzZQl2ZXJ5
IGZhdCBibG9iCTE1NTUJMTIzNDU2CiAzMAkzMAkzMAluZXh0CTIJa2FrcwkyCWdvdCBzdG9sZW4g
ZnJvbSB0aGUgcGFyYWRpc2UJdmVyeSBmYXQgYmxvYgkxNTU1CTEyMzQ1NgogY2FsbCBtdHIuYWRk
X3N1cHByZXNzaW9uKCJTbGF2ZSBTUUwuKlRhYmxlIGRlZmluaXRpb24gb24gbWFzdGVyIGFuZCBz
bGF2ZSBkb2VzIG5vdCBtYXRjaDogQ29sdW1uIDIgdHlwZSBtaXNtYXRjaC4qIDE1MzUiKTsKLWNh
bGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUgU1FMLipFcnJvciAuQ2FuLnQgRFJPUCAuYzcu
OyBjaGVjayB0aGF0IGNvbHVtbi5rZXkgZXhpc3RzLiBvbiBxdWVyeS4qIDEwOTEiKTsKLWNhbGwg
bXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUgU1FMLipFcnJvciAuVW5rbm93biBjb2x1bW4gLmM3
LiBpbiAudDE1Li4gb24gcXVlcnkuKiAxMDU0Iik7Ci1jYWxsIG10ci5hZGRfc3VwcHJlc3Npb24o
IlNsYXZlIFNRTC4qRXJyb3IgLktleSBjb2x1bW4gLmM2LiBkb2Vzbi50IGV4aXN0IGluIHRhYmxl
LiBvbiBxdWVyeS4qIDEwNzIiKTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUuKkNh
bi50IERST1AgLmM3LjsgY2hlY2sgdGhhdCBjb2x1bW4ua2V5IGV4aXN0cy4qIEVycm9yX2NvZGU6
IDEwOTEiKTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUuKlVua25vd24gY29sdW1u
IC5jNy4gaW4gLnQxNS4qIEVycm9yX2NvZGU6IDEwNTQiKTsKK2NhbGwgbXRyLmFkZF9zdXBwcmVz
c2lvbigiU2xhdmUuKktleSBjb2x1bW4gLmM2LiBkb2Vzbi50IGV4aXN0IGluIHRhYmxlLiogRXJy
b3JfY29kZTogMTA3MiIpOwogCiAqIFNlbGVjdCBjb3VudCBhbmQgMjAgcm93cyBmcm9tIFNsYXZl
ICoKIApAQCAtMTgwOSw5ICsxODA5LDkgQEAgZjEJZjIJZjMJZjQJZjUJZjYJZjcJZjgJZjkJaGV4
KGYxMCkJaGV4KAogMjkJMjkJMjkJc2Vjb25kCTIJa2FrcwkyCWdvdCBzdG9sZW4gZnJvbSB0aGUg
cGFyYWRpc2UJdmVyeSBmYXQgYmxvYgkxNTU1CTEyMzQ1NgogMzAJMzAJMzAJbmV4dAkyCWtha3MJ
Mglnb3Qgc3RvbGVuIGZyb20gdGhlIHBhcmFkaXNlCXZlcnkgZmF0IGJsb2IJMTU1NQkxMjM0NTYK
IGNhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU2xhdmUgU1FMLipUYWJsZSBkZWZpbml0aW9uIG9u
IG1hc3RlciBhbmQgc2xhdmUgZG9lcyBub3QgbWF0Y2g6IENvbHVtbiAyIHR5cGUgbWlzbWF0Y2gu
KiAxNTM1Iik7Ci1jYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIlNsYXZlIFNRTC4qRXJyb3IgLkNh
bi50IERST1AgLmM3LjsgY2hlY2sgdGhhdCBjb2x1bW4ua2V5IGV4aXN0cy4gb24gcXVlcnkuKiAx
MDkxIik7Ci1jYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIlNsYXZlIFNRTC4qRXJyb3IgLlVua25v
d24gY29sdW1uIC5jNy4gaW4gLnQxNS4uIG9uIHF1ZXJ5LiogMTA1NCIpOwotY2FsbCBtdHIuYWRk
X3N1cHByZXNzaW9uKCJTbGF2ZSBTUUwuKkVycm9yIC5LZXkgY29sdW1uIC5jNi4gZG9lc24udCBl
eGlzdCBpbiB0YWJsZS4gb24gcXVlcnkuKiAxMDcyIik7CitjYWxsIG10ci5hZGRfc3VwcHJlc3Np
b24oIlNsYXZlLipDYW4udCBEUk9QIC5jNy47IGNoZWNrIHRoYXQgY29sdW1uLmtleSBleGlzdHMu
KiBFcnJvcl9jb2RlOiAxMDkxIik7CitjYWxsIG10ci5hZGRfc3VwcHJlc3Npb24oIlNsYXZlLipV
bmtub3duIGNvbHVtbiAuYzcuIGluIC50MTUuKiBFcnJvcl9jb2RlOiAxMDU0Iik7CitjYWxsIG10
ci5hZGRfc3VwcHJlc3Npb24oIlNsYXZlLipLZXkgY29sdW1uIC5jNi4gZG9lc24udCBleGlzdCBp
biB0YWJsZS4qIEVycm9yX2NvZGU6IDEwNzIiKTsKIAogKiBTZWxlY3QgY291bnQgYW5kIDIwIHJv
d3MgZnJvbSBTbGF2ZSAqCiAKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvY3R5cGVf
Y3A5MzJfYmlubG9nX3N0bS50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3QvY3R5cGVfY3A5MzJfYmlu
bG9nX3N0bS50ZXN0CTIwMTAtMDUtMjQgMTM6NTQ6MDggKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90
L2N0eXBlX2NwOTMyX2JpbmxvZ19zdG0udGVzdAkyMDExLTAzLTMwIDEyOjA2OjIyICswMDAwCkBA
IC0zMyw2ICszMyw4IEBAIGRlbGltaXRlciA7fAogIyBOb3RlOiAzNjQgaXMgYSBtYWdpYyBwb3Np
dGlvbiAoZm91bmQgZXhwZXJpbWVudGFsbHksIGRlcGVuZHMgb24gCiAjIHRoZSBsb2cncyBjb250
ZW50cykgdGhhdCBjYXVzZWQgdGhlIHNlcnZlciBjcmFzaC4KIAorY2FsbCBtdHIuYWRkX3N1cHBy
ZXNzaW9uKCJFcnJvciBpbiBMb2dfZXZlbnQ6OnJlYWRfbG9nX2V2ZW50XFxcKFxcXCk6ICdTYW5p
dHkgY2hlY2sgZmFpbGVkJywgZGF0YV9sZW46IDI1OCwgZXZlbnRfdHlwZTogNDkiKTsKKwogLS1l
cnJvciAxMjIwCiBTSE9XIEJJTkxPRyBFVkVOVFMgRlJPTSAzNjU7CiAKCj09PSBtb2RpZmllZCBm
aWxlICdteXNxbC10ZXN0L3Qvb3JkZXJfYnkudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L29yZGVy
X2J5LnRlc3QJMjAxMS0wMi0wNyAwOTozNjoyMSArMDAwMAorKysgYi9teXNxbC10ZXN0L3Qvb3Jk
ZXJfYnkudGVzdAkyMDExLTAzLTMwIDEyOjA2OjIyICswMDAwCkBAIC04NDYsOCArODQ2LDcgQEAg
c2V0IHNlc3Npb24gbWF4X3NvcnRfbGVuZ3RoPSAyMTgwOwogLS1lcnJvciAxMDM4CiBzZWxlY3Qg
KiBmcm9tIHQxIG9yZGVyIGJ5IGI7CiBkcm9wIHRhYmxlIHQxOwotCi0KK2NhbGwgbXRyLmFkZF9z
dXBwcmVzc2lvbigiT3V0IG9mIHNvcnQgbWVtb3J5OyBpbmNyZWFzZSBzZXJ2ZXIgc29ydCBidWZm
ZXIgc2l6ZSIpOwogLS1lY2hvICMKIC0tZWNobyAjIEJ1ZyAjMzk4NDQ6IFF1ZXJ5IENyYXNoIE15
c3FsIFNlcnZlciA1LjAuNjcKIC0tZWNobyAjCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVz
dC90L3Nob3dfY2hlY2sudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L3Nob3dfY2hlY2sudGVzdAky
MDEwLTAxLTEzIDEwOjI4OjQyICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9zaG93X2NoZWNrLnRl
c3QJMjAxMS0wMy0zMCAxMjowNjoyMiArMDAwMApAQCAtMTA2NCw2ICsxMDY0LDcgQEAgc2V0IG5h
bWVzIGxhdGluMTsKICMKIC0tZXJyb3IgRVJfTk9fU1VDSF9UQUJMRSxFUl9GSUxFX05PVF9GT1VO
RAogc2hvdyBjb2x1bW5zIGZyb20gYCNteXNxbDUwIz8/Pz8/Pz8/YDsKK2NhbGwgbXRyLmFkZF9z
dXBwcmVzc2lvbigiQ2FuLnQgZmluZCBmaWxlOiAnLlxcXFx0ZXN0XFxcXFxcP3s4fS5mcm0nIik7
CiAKICMKICMgU0hPVyBDUkVBVEUgVFJJR0dFUiB0ZXN0LgoKPT09IG1vZGlmaWVkIGZpbGUgJ215
c3FsLXRlc3QvdC9zcC1kZXN0cnVjdC50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3Qvc3AtZGVzdHJ1
Y3QudGVzdAkyMDA5LTExLTIxIDExOjE4OjIxICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9zcC1k
ZXN0cnVjdC50ZXN0CTIwMTEtMDMtMzAgMTI6MDY6MjIgKzAwMDAKQEAgLTE0LDYgKzE0LDcgQEAK
IAogIyBTdXByZXNzIHdhcm5pbmdzIHdyaXR0ZW4gdG8gdGhlIGxvZyBmaWxlCiBjYWxsIG10ci5h
ZGRfc3VwcHJlc3Npb24oIkNvbHVtbiBjb3VudCBvZiBteXNxbC5wcm9jIGlzIHdyb25nLiBFeHBl
Y3RlZCAyMCwgZm91bmQgMTkuIFRoZSB0YWJsZSBpcyBwcm9iYWJseSBjb3JydXB0ZWQiKTsKK2Nh
bGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiU3RvcmVkIHJvdXRpbmUgLnRlc3QuLi5idWcxNDIzM19b
MTIzXS46IGludmFsaWQgdmFsdWUgaW4gY29sdW1uIG15c3FsLnByb2MiKTsKIAogIyBCYWNrdXAg
cHJvYyB0YWJsZQogbGV0ICRNWVNRTERfREFUQURJUj0gYHNlbGVjdCBAQGRhdGFkaXJgOwoK

--===============1908233761==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/supp-51/
# testament_sha1: 56088d70dba3cbea1ede176d0eeca096a90be167
# timestamp: 2011-03-30 14:06:33 +0200
# base_revision_id: bjorn.munch@stripped\
#   1co3i4c64tooueyg
# 
# Begin bundle
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


--===============1908233761==--