# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@sun.com-20090922074909-wxt7kdl4ls6on0ib
# target_branch: file:///data0/martin/bzr/bug45235/5.1bt-commit/
# testament_sha1: 384ef5a4cebc530056410f97f0d78c2d1a28bfe6
# timestamp: 2009-09-22 09:49:16 +0200
# base_revision_id: kristofer.pettersson@sun.com-20090921095815-\
#   8elrgetht7aianb0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZGismwADAj/gHV8UAB9////
f+f/+v////5gGz6dy9uw7DW4CdjdxfPvvudOUA6GlaF999be3ynKWz1xL2ZZNdXUz7vfV993tqvb
u3vc6l7nXaqGm5xuqvn3N57OxTl92qsEkiaGlPFT9A1MJqeFPUm8hHoKeNUeTUB6gGm1AaNDQeoJ
IgmjRoIAhNNCmPUah+lHpB6jQAAAAAaZBkApoQyTRE/KNT9KPKPIIaMj0g9IAyAaAANAJNSJNEyZ
NNJpmpponppPQmmg0Gj1NAANAAAGgEUQhJgEaVP8mSU/TIpvTJlT2po1HqHmoQaMnpqep6g9TQHq
AiiECNEwjSnp6IyGVP0SPUemp6R6htNRkNB6ho0GgDTdrzAr8w+xP3nhCXnPCP8mz8HxFT1nzkFn
7x4EmTkEovxFaLvUT5g8OZmD/uMcPtbnedm1lwsBou/7RNBijlxYX7qd40+DpLKH8jpPdkg8bg0/
zjv+zwv+w+CuzJc0ZbLJGQ5WlhYTdwT06+VsdyWIzTB0UIg2oGhdVLxvLGg+Cf9+Tt254tPTHbjw
7WrHiMUY02d/A3T3Z7r4Fmbn2fHHN39P+4Ob9sDAoPuGgXtWuEdnZNUrW8vuQxcDMQP1yycchZlU
oBCIqdXi8T7I1YAd3CVCQz70Ru6zITRv4igNgMuFFXqLinHbyEPll5wXxe9xBuZDJh6oFNibAMt+
PqkciT8J8D4r6cmakYYP4M8WiQ37pmjVasP1fZoc7E979BhDe8bcgj1rVHRky3HIQHF5nQ3ba+za
2BzsIBlSBB0sCBQwpqIiCkUVRVDwEDoLwnax8Oavj4wM5EDac52Tv9UJlCVMEnhAy6zXy2iPLfkB
PdJzgftBgrIKpFWazfeyBz9Unm8WXfxMasdy1HdVL5kVudY85Y6EW5LCSJZXp7Lte5aFFka+/Nu0
DSpprylwOouLSpixrjWNRW5zA5t5nsasWEOXm8smbARKik+jAYSQxHoOBS7N84xH5Aso4ukhw2QE
ros9HjLAsGA3gVQwEOKWskKBjCK0FpmKzXfCylcw4WO7JojMVCpBhh/qEoXigVUZzvGGGGCv2jhh
ERERLBsJwBq2w27pqlkDE4ThA5DWYhmZmDAKIoovYzab5SfWKUie6bbmcQoutfpCQsD2Jj+gkcX/
DA4YTILWftho7FIaDFyMAgVfYBtjQHfvUCng0dMFUwr4l996i0LVdj2ix+c6laX0t3TLRvmhxmFd
oiUzSOHBOE9HUyS0vphxvVFATLSjmrRo5S/6doqbxlTjNfZJB7Ri/SSIGzq8bBgq0CrInETny+0l
JcS9Z37QlHeM5LD5hXnwI3LPedNbYFAxLSxXa0aWF467QxuuZ64kmCRwg9s6TJYTgGZMgKJ2dZ8p
3YbYRb0wuxzkEBbOXMQQw0nB2MDVEBWZEg/oHUYHFC72QNovF74QdyLNHvNKnhwaGuxI2OlD8GGz
0Ffy3Cm4Y4sE4lihGXUNJHXQSDwSoz0bgXthhNB6uqQwQJNwSo0DRfm5tIHCINyZ5W4ToOYIn5k4
zaTrlXRUwMAosCUUDlTFDa7dupM3iNLthMri9t8o+/CN8uMIEe4v9QocaiqQWFay75TIYuGbchjM
wckTYdqwgQXgJhesBQjnqG6Ko6ymYqWfUc+gdNaKTZr0X0ivCG2yRoyBUqTxxmXGSNptSsGZHdqh
xZcgjDrhBeMBVCnOlDHmO/iOri6/hqkmbdfavutvm7I3v9bmIx7kWU9M/jw8fYhK3+71rwk9ybYq
qIqoioiojzAJA287R9+q1thrV4Z09BsBOYuBV0XSZQFIyICdvDtS5M7fj3unt3y6LDTb6Pmy5gJ0
YZEeYRznNQ3kGNpLx6pFPHkYd6M075GYq0yXw6HXrk0E8muNTiPkHhWtuMX5+iYuyuydgQwSGHuf
mKkMe+A0wBz3aZyN00BpwsE27aU6e6m2phz1MqSW7kB6m+HrZHyCmtzvS9bTPwZdJTKkMkbSs82S
8MR6hB5JhYyrAqZ+ZdygqoPLUxUBUQsRLLK2VqvGp255eIHLNOzy4SEVmVWOt9dHSCcc1tdVuDg3
qsyScSTAgoVNhY+RM8QgI28sInjMMsr1srAaXaQmMyvYnX7+nWBjz4p/JMY602NA61YEzRs07eF8
uY2bLqDUhEuhS0EQFu0DLir4yKsU54het0SDEClBoUlhy0kjH3igaOwolm5bzDOg+gphf59GjtLF
xiVHIyqLgaG8kxvFuCImEDiCSioCiLAjlUcY0KlBzIkWPKp1Et4pDiqaMdjBZlMQwa3aEL5DkJvK
GzSWBKkAbmmvSbwaOFwyRebz+elsMNXW+TMsczQY4VTmAshaMY63TFcmOIvsYlK5Y2lh3YGYwaYm
rxGfoO7KRcYDi6CkVjMhV8FB1cMxkmHYZ3J/sREse/UhvM3jmb8YxrwIatlqVF4qN0deRdJ2Ydsx
adACC4mnM8kTOJqQAN5U1y2ZdjPrY51uKEiQtewUVAGG3cLxMICpqXiTur3wOr8SQlUVjAk8ShQ2
OAHZdWT0KCt0kTqrsepkQUcxSIHcYwA2YZW+8zUKEiZ/5iB1PZqsEtEbWOmN8dbiHSLX2JHHe4dB
MRG4vkyZrLkLC5zCOFxHG4UIgbU7B5CgDaae+hrOdYaCtBqEYkQ0IpzQPMui9Ksscwr8K4YFs2bd
N9WJENPNhdquF9CN2+/A5lBXAdGk5eViYCwHyK+8QnvLWxN/Exoe4DET0jnaklO9JNMgp5t6DtYz
FI3li4zNx5zEoVKDw+ZZiTdV86+qb+7dXXfLXU4WmenBnaF7kL76la78tBErpPJJQDqPAYbz9DZz
NkSxXm5EYjzMjPE6E3bdZOy0Aw1oUXlga3KHJarkr5rJWq2BpAJjIrscn3Ehijl2zNsNEiu/CkTz
9OM+PhYvrBa8tVYrzuRpNZsPIXGR1OPy0O919+b8QrzLVc1i+mmp3nN4pjgXEhxTIOcOJ2qT/wrL
HDhfh2Q7AncgYQXv5JK33kV1U3OhOu/HrFhfi488UNpoS+Fd3douG5soPA6YlSBv7yW5PmdYYbjG
mJR+uw941o35DyMLTCx7ygQxo9xjZRErVnBXDJREmEEGiBUdAQAjE9WZIUTzDTCJMgYmX0pXfjPO
FgKi3DGLHs6GWus+EbjrvRddEghxS3QSdFBYoODi9TZbPFgA3hHSP95tmEeH7L48t1hQfo52GDqX
X264MZ1NN63aF2IOtTA4C+dMBIlb2MsYsNoqpig5k5zhHKyfuNvADrxxM6MtJQOBzNBzhujuSEZT
mV4A1o8ylRPL60zXzStKxirNfxUgERzCPb4kByyH6UUHJuegN/5BK6JMAdgRF8q/oJ5CH2gf8fgA
ZiCCQTHc4UFSO4WA9wti7u57EhYX+ImAlzYMGPi/zyAGUfh+64FcDAXjg4FQCw5ETDCPIAkKFzeg
4H3EEhQhBBICGQoSHnxPLCjdhMSNwJlc6BPnEvZEao4iewB5xNpIm0CwwyheA6F+jUDQ0ov/iQLb
X6kebCpwESRIJIcJBNgb0RATdkIfrIQ0mg8ou76yg45uKieISGoHIG8uiIWAHmAKku8f+lSZHoIG
SAD4Bd6L9N5sQ5VbngKSJwGY9rfD8QD/x8ap3QpcDiFgTaivENd8B0MHIDqRvFKCwK7BYYEgXmGm
Qh4gN4+BHoQDELAwQLALBqViJEkSDlBMgo4yAaCZBTWIVVyC1EeMCAG5IApVkGByHI7zzcwpnMC8
DqLhwA2npAuHcoairQ4OIaB2siGsgsSYgFhIIQRBJN8hbIE5AKAnihEdDQGUzo42UP+Qh9XdJVsE
JlTWD0GRC4LggE2gkEoQOh412IwoUHkPP2XHyGUAqHgNWBIeClOtuxdi6RwB6joO1VpyYZ3pMFip
LUT1yjQ9LwXl8RI/2GLkwb0keDJIH4qP69SGAYuQyl5FIKlQrCYhZjK1AwvbPfC4UoadQBRtpAmC
BMriUvzh0iQXugPlcG1hzG2DeJo/LERKUgTt9okCdqcU8MKHmCFTIfrNY5CB0nvPwH1mqD7DcftN
Xv9jL90HSwqGgZGS42HZu0F5y5HcOrTY46ngaGWCzjxl9FC8Dqmvvf2OJ19fnCPqXF+nio/gPo6O
RKRrhLt7vqMiLMMAD/Ln/JTQV8VpDFUdcGA9ABsjDvorLdUdjcEDYeGHca7JIvFq+tNMBUQLzRjV
wKBdEwxoJHe50zbm49+K9SgwYxKHxPhw4YkRAY0cqw1QjBN9QWyWlJpU6bjQjeAw60wj4+RDTCbu
wg8hU6juPqqUPMSHFl8RiMDqOVuf6O5OyGxvqWQWIOY25299n7JExvxOX+5wyBLj2niwrGhxNxyG
OcxzI9q4qBXOoyQrAec8AlB/qAXDHOjFKHD1vmUJvmU3ODmUFrU931mcPW7SVoaRCgBikb5YJaBs
uJGCtSb3UqTigjOwQxJewJye3CiGWS88bVcTAsa9QymEMkV5PM0ZtaDXVmHthmeFJIC0NbSkpsiW
/lpfmLQG5JXXdQ09BrOAyONYMQb0lCWUJdREnEp1Sazd39RiLFf7oq1PZrbicrJ533r3Sehv6Ruw
iMYB4xdVytVysHnhoN2PIXMPVhoyGpjplHHjYzwkQqROUgUzQS2sYOQUN6aFSrmoy8jAioqiYZmY
eSoiKqw5SN8lGYZDhdNhUQID5oioQ90juOFDwiwHOUVA9QpY3MOKgsYrBqmVHGZliwbX5FLOOXAz
VYYJVTYQiaNNJoc90ZiYXpkev3j2GKpAlr9ZqW6d5NeXlMou0cKbZIjQYqXRtOOGVsJY23RhAUq8
QRCVRlSgENIB2EjynI6/IXOUaAHUIWQvKPw3XNFA2JbNd+nssBGreN+OCMZnlem0bEWbkgIBuNgA
OKM2Yu4p5K0y6FYrQtVeFeLAcexbao3UOBzVMHbznrPr37iDOBlTky5PTY4VejB1u1hJ5WhsScm1
LMhUDn7MycUx7E68dAm4cNFmEswNTNLq3HCyRuYYmRpBcwlWE7G7x0rGMyBLfIuMDgBc5sKmibD4
muUiSFSe11pbao3ghnys1ITu6xwDcmFuFNW1TMDJax1NihLxXWJf2wgV7BZtSWm4d5QEgnA9RArW
KLhjvCFggIZ/RLsa2AsbzWdtQfnpyTQuUo8BL3SiQ5ztNghlrc4Z7ecAvjGwlXKGyC4TmI/sTapj
IUEyzDmbzMO11C/enCh3QfOnWkjYhwGHuYdT5wnz9RxoqYOyX2MDkHW6YPhxAvgSIHtAjr0fM8+5
sDeLdAvjECIUUimUOvPEFzbaCr2EL0PfPS+nwG64zD7kOri5Hs6Tsgh2BEjuI+AEhpIOBvBilysK
SBQbIyj63laCdiCxBhFYqENRy5YGbvmCpEFDNGS8mPK3CFMdHhUcOSxrWAxyZxB5VSWQjLzZcqpN
gkxw7YY2M2wvJBnnRVKxnwDcPY38dBAd4hwBV80D9nl49Jm1ufDQI8UAnRCcjaGA3OhsQNIQwgZV
CzXzAVMhuwGTj9roTN0EwbmnVYkMW3XOIYMfW3U+OR5Z6oviBiMkwmQySRBOY6JvbsHZMs6iiLAt
rtKAMQmww2A9omVloRAVorXAfG0PDYJ+3QmLq9Bsd88H5uHpUywdjfLjesWxyhGhhGa5Hn8AFsTr
x+ftOx4N7y4Q4wkRnuoUoMHLWENDgeAWE6WcbGDA7whXFdjauoPoH9RAMBNzBDdIZfoz8i5UYQ1S
swEQELEQaoSVaSpKul3hOVcKxcDQLHZdzX/FgSeWr6I9XJqRdBqScANV5ML3kn25rtDEJCaRhYMb
w/Uge0S+gGx43D0izOCWtjJnTnFedNRpVGWOoiyc9xsJ9GtXk9osOZJFpl5aKSmnAH2H1dlQn8/o
dyRhomXRJyDAmvdDNgHAMmEC3YUXS13IVn9Gr5xxqUZocU6ZwB6cZcBtcmfEyLxMx0TBsbks5eps
ezu+wyPL3Glvyz2gjaGgUKtYpl/DVpL3ktaSzgVa1JVMyRCEjWjuFKKyrADRh2tEUs1ufBO0d6eO
OEUpEhCwvgMLnty01rGcgzQSVajIwuA86TRCxWVGYUtAS6MyTCVS5GJuQiFL4ToxHVi63sauDkbX
QATnGYlGApClJn5QGsl/tsUuSsEpSEbDJPE0aLRkNWr1iGzuSEhb4AkIBrMnQ+F53lNsdwLGVnxQ
2y+FuXJ9ZjtlvRiQy/e6HIuGVSkK6wN2iQDOGcyTsFgbCEDsEgOm7YN5IfftlQ6WCUpjImveGsAN
7DojAhTYQq1VSV71UIWEUEJ4kqAxAMgGbD3zYVLgshcmL1Q2dI3sIm40sJzKsmmfR1v8B0Bn1g7z
CHTU0cRzg5DN8UF5zIlWrQq5eUhOvr6VoB6PIh3UljONZeAS5ayOrychl74A+lY1fV0vnWta6sdZ
213TPEZMLXcUw1hUh684TwtdVjxpiffUUSzWIwKqZbDMNFYrVbfzq1Z99IDTavSsOs71E2rHwEpC
iiOwI0gqhEWA2KKEjApKIpIgiAxggrA8xJDbqJAoTVRTgpBQSEYc84rzLNJgBRz9U78V5sZGS+jF
IsxISZgoUeRvI7GB4ko6mxfeZbLmmSXwhA4bgtEeQPaSdfilOaGmsy1+JjNne9giERISAXAYu8zt
QNHleF43WBkcBOU/G4aOdHIdYe0fap8glO4MFgyEXxne5nS6IGUF90ISQkEIRCDpBCEOd0tWkQ1A
JJiAowvsYpFJJO26uipXEwLixyoJFLBZIDIhARC6qgzQF4KQsIGu7T1FSvWZhFRuYZgoIvGKXOWp
SES6FTFQ9gTzAMWBQsEhqmBEIJjuJRFt7u787ZAjOEDk1iilUDQaTBCJBBPy6pKHTjMS1gqaORuK
9sY3AwZAIsNw2CxWLYDClk5m7t4VwPJse1xqGn1D0pqVVVVVVVVrDIZg6uk8Zo9+uY9s4UcVUqql
bhfoUQgidQdZwxJLcwFy43teXvV6vIWqMYAiIlEGGl3YaklOEJcCt7A79qy5JQN2jFegUq5R6mAx
AM2USXJDEc/SkZaLjACuZA5nDoXcMCyu3ooNr+3OVSCyX9DKL7NT2eDIMwlLNW5JIOgWAgLilxky
e5q7mSGwmToCQgbN4/cJxCvKVJJgexgCSkElDhZBo97J2eHg7xdIefXychwQLuZ1EGBKSE0EiWFa
iRZ5TNYCCH3BMg+Nnro2yL1+NgZQaLiaSX1xnRGXiEyX65cNcoT3XsjLTUfIG01kI0MRtS2CaUsJ
bE9bm44IyJEtyPfzHD3FUQ9cCYXshwjfBDHX8jWXZwsFADABwJOSaWEuODSCALpk8sshWMZxGWFT
6DCccQMXJPU7cv2jKcglCUIIlCUIIkx68QrQJ1jJUgdK1Qto8XoZlsXCKQcCGoZQ4QVfdgfZ89bO
DI57fzM5XFdnXahERBzwvwcCZMglkNCGJ8Ysi1rbQLyTlK6WoW6UfmnPvAw+R/I9pkTQGLoYXHAp
k2jRtwksFk54agwGvyge3oPQYCZhji+knnaNz+n8PVcjbqfyMbGCnFZyjTMd305y4HxX4g73DsZ5
XRvxGWCJ5vC78g44C5OIBE6oQ4bmR4tilHBpuaJ2vkk8yMFuQoLtOSAfw1Zh0WoNAhgMPA0aKcBt
ZL2EO8WFdz1X4QFzs45k0Gk5BJc1sRBBaClH5gJMQxqWZUY6gFgBR0QijPgrhnUubCJpIYNWDGqz
Ycv06SReAw6R3gxKSuh/4u5IpwoSEjRWTYA=



