# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@oracle.com-20100922144850-\
#   bgpht7v0ib1qukqf
# target_branch: file:///export/home/didrik/repo/next-mr-opt-\
#   backporting-merge-from-bf/
# testament_sha1: 61307e27385083bc57555c0e16fc090ce66eb7fd
# timestamp: 2010-09-22 16:48:56 +0200
# source_branch: file:///export/home/didrik/repo/next-mr-bf/
# base_revision_id: roy.lyseng@oracle.com-20100922113738-\
#   lzbny6n2lwtup3tj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfXt0mYAF8NfgGAwWuf//3/v
/vD////6YCBxwdXWnsYDO6g+6euIDt3Pna2e9nexu3Q93cokDQfbOm+wod9RU1BSwhzuIXsyBJLs
GEA9UwgU2zQaKo2YpVVB8NCJpqmm9SeU80o9qjR4oMmQADQ0ADQAAlE0I0yU/VPKbRRp6mRkyaPS
AADamQABiA00ASoYqbTYqe0nqmgaAeoAAAAAACTUiAIjBIU9tSNIGmj1A0yGgANAG1AIpETI01NM
JhoTU8mQBqEJptMo9Jp5TaQbU0AVKIAJkBATCAJNMJQAxBo9TQNA/VGzN4a8U/ImoMwlg3AHJ34v
PaKjl6HHRIkMCocyp+lorZJBHAomqe5F5MOdG1ifhZrsD3SdKQw0t/FHnwWKmwDsVuUktHJXLxJE
vBhhiKHFw1S65iANhLFXsK4VQ2CcuEP2w/3fTXWGLJvCoZtcEq5CGLqPlwdxs9aoaZQYmF8fTcx8
LTCxiX+SrYUIY5Dfsdock4cR8aPKWnK3gTQm9Qq2/XytczDjlsWLXfp/KuxLnqAooqXlyixwBFhg
CTGxwSjWzX04STWbl3DzrwD1QQJ1ysjAFAU3HoTgQCe5LCaA3AHp48a72bc8M/WRQnvMG1/l1/ZF
WqXnVrUwUWKlMfsFrMYmhUgQYPAgdJTabifJG05R2U7+woYv3YzmkpGR5UUYWtR+7BCWGSPJbFL6
TfbOL4sjY6zKCrk0KAsgTw4cx2rPJZCBB1cAFCBuKgKqgI/r8tjjk7UWZxzHPC1s8ca4OBLBCHJA
KSQB1gTR11MhVx2sUI0tArULezHq0y2DATENj3ZyswXgbLinx5pnmIvHfUacDRzVBQxgKzByzFIK
PGCVV+hQiL8DX+C9BdnIEp9aDoQelBhggWKAoCkEYKEWCqRSRRRYKIrFWCwUBQPP7XsgENknRxz4
2Ane96qdLdDrpg9KFwTRxcsKOuNLSYOzo3M4VEm7UKcKSQlSoDFTDLJGFFVRRY4YOECiwNkUDRLq
jl8nHs4RiqDkM3QEimectVfHD1qtHBLW6WXKQDBEZLWXtXN4osiWWLlrBE2qZKsRWhcvJGFrUKUh
lohpXRgprSxCotrhSTIwUtzE2uHCFKKbOqbWUFxdWMKWVddGyCXNmzJXFY2VhULipYxAYuZICxRa
llqpd2z9EA3kIE693xJ5AiDePwQMiI/2FL/7VXEphJIsB/965mE9QiddqD0cKP24ZNN/NWKmDn9c
taUkU4XsQenFOmdlKDX5XiYjE8MxAI7REGzIRR1wqRBWekakQxp1KESIoV3pcOCS1dmg3C1bZr49
72r7vx8cgJ7MzlhQUrEYHLtAnZ7befZhrnbIlDTkWu+ebGG6pEQDjIAEXEQKqcagrnnlznQ5JFh9
D7iqgLXrPbjnsc/i+hBWGJS9fLhNeNffHH5oVPlgWhCs1VWEhaoFBIVxON4QlwUgCyRBABVhEigh
IoS9QKCQZBRRiIskVFisYCEgwEJBgISFa9vilYHu7+/jZq3gPwDoSdSiL1FVZ+aixY/IoxZIRm+V
KfBl83odC0zFuCs4ijrPCZaEyopJnIgoKTthBmHwussF81UdbH5UWLqnjIeO+y14btljJ+mVi/uX
jFZIYysmBgXHoCdHCzs6yEZhBHcmJvHESJCj1E2q/fNFhmjxuFtttdGCQwgEUovWM1Fq11bo9ev1
hKCZ6YQn4G52j73yAbB0rvXoMLeoeJAlk0SS7IYJSYM+FgfCyUgXYWZnlUA80g5Z53KGmQtaoYIa
Mul2SYpolOiK72umdr1pmSExCxhGGP90Xro0RooqYIpVFFEo3Vk81BYhGLVZXVkytRIyYKJqtZK2
rUZK40MITgirBZasZqM1JaXnReu1YTPWqrJR+v+6xppVRclFUzncrtatZ3vPhCYGy9VxYtG1ueaa
MFWdrJqxvzopMGLJndW9dJiWrsl9WFi9bhipYiRuq4siS+aqNHBc9GjlyybMGbBsyWKLVu0azfVe
xWKPmqeyROKDpK9Qak5J0S9ZLPU1OytEakbKAlVWVTBgTSHjx8/AGAQ4daRA68CuCMyogdmSizrT
PLY/he4DBbhHSYvQEePq2hhQZOcbgLHTPjuuiwpQSNnje8m6rgzmD0eSqWUWsFnm6VbsfR0wY7ya
4yi0toyUV3XRc5WTgvXX0Q9bDDUvsSpAgsTQKXERhw9GEFQmpQc8tIFxi5mW/RuPyZ8LdqNy7dpT
KxaVvzBsjC1QEzOMbCgTWeRao3jN05nhykJpc2ExEyEE3mEJY3SJSRxUWUOtD37urd2XaWZ0pZzh
OaidBJ4jJchgUHYdDQqLOQidfAyhrgeNmBzDnrsLJyoyIRUibQbLWHZcTDIkmBnHlaaD6dzFmpVW
brFfRju3wKNoT0Tssd1ThZeo1br1yneo2aOzyIqwtXKPhcg2eSjg7n1cIow7q8nqTaE5bBlQNN+y
9oNI0YcEpjGKQLDyt/BeyRbQQJhVVZhnwPXPZtsYG4ePZsHQiBB1FEjjCWWm/osL7mLudcL6GscH
ko5c7UiXry5pUsUeNu1srWrg2UhJVfLXVZMXkuEGWZJp0FgwtiTHF1pAvOktaIm4o4vKA4oc5A6l
s148DncuUnfY3tgo36FHmXz49aqqNFF652dVzkyYfKmHdSU422O5qqucaqrWz6reziivZvWWUc6X
OLVlfXZS+9YyYqPfNJ/vpE/v7v7z8p6wnBxZ6KOdqxs8Fy9c5v/khZgxcngZjjIkzyajT0jzsIxv
HeOyX8RA66AjGR6DLt8G6ovgJJ5IHNNAG/z+PLzk8XJ+l0RlYFJbqVXDKxXWekj8fhgvUZQlUqo3
jRipZSnDwffVxlGeGKqwvfjo004YCeu03iWMeZiJuXDsZdDJJecMCrg4RfZYvKzxYbt/de7PFVu1
7tOHNTalLb2yxxXLejoxv6XsF6r6YbMLdqUtruo1bS6k8acFjteoVtWadVjZb1xpTHqwaLmrP9fR
bOjwIzZujNcvlzmudNVVF3ZSixV0bbbnzXO5gxdtmAylRfxkzRjN52BaebQoa1M0EF2kmyCLejy0
UgCchtN6VSPBBmMM4rFyt1dRTOslRMoihUckT1HbIozRTtCe1JNBvLm5Vixkaesu8/PwZN3ZrrM9
TNarUoo43YLqWr2Kqqi7j5WEmNq9RY9a4LJImbmzurL7nnbMC3guVo9B2KJkJlY2PaX1MNVSyM1N
jsaFHp46eBcwW8sublVjWutKYMkiYMFd3TJozwbsFWjZE5pRo7lqxeyfB39+Lg5vVo732bsHRtIb
s1re83XOrxfBzdZD67MVj4v6OTo4vzc1zJb5w6M6pXfvxbdqCmdu0a8udVlbHDairVe9GVvSY4t8
XS+ub39obGY6ca4LqSE34blGGUCUm5yLbHDhfCas9zXBiuvLGa6xpMbmrEwYLXrRs+s7nz4OL0Va
Z5KUWqWqObgvbrlKt6uKtzmsdXNdyZMGWjZRJk5Qllzg325KrGK15KM2mj0XrvZxWNVLXKlKcXAw
9rbJzYtGK5ncqsfzeUh2c2Tu3tVVxdrXFqYqc3RRc4LnZYtfw7PV9nuwc5D8Pqwe7J2UMn0a+PjT
l39beC6Z3BHYqiHZWVzFcL8gnRL2DyHFLCjQ7AwH0UYNlL1NlqrhnsywXsHrwU1YvNfpjguVebBo
q1cNWKLVjBbr66au98ujFu3Yftzdyw7OboyYrOjZ7LXVxbN3ycts17FR3NnK+riVauNy1qxUdsb1
GC5st0WM8aYZNsZE4Imr4z8nJqtZuiixo5OToyaLmLm8PxCZObi3VXhKVgwBwoYGiMWCQX7gdO16
PFKUIA8NNmYtjGxNXTkrMW7tLhwzkO8Pj2w01iEga5ttDAiRwGSrVUudmZx8tLmsqwZOL/JixWNF
05bur8PhIdePOnKtM1jm4s3wXTFw4qsHRov0aLnTmp76bdNDsdCtTlyMDE8nHDNcjQ8TxrFXtLHX
LaEndcq5KKM1rRYq3c7VOfPOauK7dRawdl7kzd6jdcx6tG629YsXsnm+r0c2j6vu/JY+KQJ3DrHH
uG7gFIjtcetDQTO+uPiTKqGPhbtHTEtbLIax12MoEB5FFJCkrRXsPENOmZGQTNRayULbfFdM6LmN
dVjE83Fu3ea9Re3YaM7aGbBmxWMs10+lnBctaMWTGtUiac1rFq0umy/V6XOHDNRtNFdNJ0c7VnLd
expS237wmWHvVg2c1WDg2cVV7o2XODsuVYKODkxcFj1PF9Xs1zwKzpVY4YLapfCToSisFc6LOi9h
YDjqFwSlcXGeixZ3PCzhcaWPg0dnjfCZlISbO5xVMmi/fRwtcnzWa4sWC1R3uD4X8Wy1i4rHFRpx
xdKcma9wX2Lmamjn1vWuhi8nZk4sV7xZNXRSr4cLGHeuLGSxxWrm613rnmyhObbesjOgaOiQ6ZOO
1EI3ZCOOsrAhNAkyzcyExMbcxEQMQEQHx18Jj7vfvQd0Qr0nqwKaoJgiiwQYgjIiIUxVgoqMREgr
QZQKQiMASUgQLkPJCQIrMRIAQmCkwUkCnX7UGmjnxzlSD5MKj9DMdofd8xPqAfsoGYU+Z9ArLx8w
+Bqcz1KBGQFgvvDzEn9xNTb6jWCB7IQ2BA1Fie4PhIbzATD6hi/wRYQlKfJQwBsG6LAtDMkMmLJF
ehYhDoc/qM8h8pDnDGQsVChkDoT/sMT0HASWTLN2Kte1XV1/x6xkXx/7jNJ6sFH1veh/i1UV9LD1
R0ir+VgqqrnVrhe0bXrgHUMIQPAyhqQh7yjF0P4iwvi9muQnm8pDWMkRif2njIj3KKd73O0QsRrF
qyKFER4JH5r/brhQp3KYN1kaqSVUkXRfBPM8fAdVIdx1kNGq834vfrSlXxKRtH/ZOMUUf93BEcpB
zjAqdExSM27d3SMGiTJ4SCsXh0huSFSBZjBhGGCi/p53JDUOJCNXPWlN1uEWPWPIt84+BnFWiihc
rDlFjPKlLyxgvVOacVkVb5F4/hLokcTFvJDiSQQVUBExh0hQw2OsCGQHgdC+L+rmpStKk9h7D4nA
UfOc/ozHzeZD9qEIMApCLHtFHEVj7mkDAgwgV0k2Yo3mFWhqVEb7+bQ82TS86gkFrDMgFG+oUfFL
LaBBwIjSLIkMKDCqVuPQRJzqujSj9uquNfWpqfmDl18rYwMByqkVMjS9tMKtpmihoi6AisGyFQSb
hCfc7qqsUWKqgKRVVVUiqqqoQj7vyNMSqKShkKhQKRg1Y5fBImg9ij8xyFCGdEE1ioCPHjHIco8w
BR5iQLT3ikeUUIjEzXx5yZK4l2jhKlhKSrU3ypf9D5yc1Hm/wf1k/GfnIR/Vg0YM1X9X5vA8X5Zk
mrwb7M0Q5FR8ixrQ2HsAoQc2YUa+SPpIB/Q1HWaTGYeDjcqI2xgLkVq/l8j3kKjPWwSVGNMMIjI5
KGXWUtDabD7dJ+PeRtOzY+A63V+KLrqvyfJImK9+X0fR92bFk71rBwtcGbJg4PFV82jwffNo1Wvk
0bM+DiscFjJKPn1iScFy1o5OTmzbPm7OLFo0YKOzFr0arqqsVW9FBJRmwesseD8f4TNYxavcuezg
+rVhnYO0weQ/T4gCEZFDLt6dLcYig2GYuNpIvlRIxloSKcLxFDnghRQgKMHMDqDiJBBBGhixYvUW
MFyx7PUq4aqerQ2Ytlq7Vq738UOKRN7VP19sjd1UaMHZvYsdeh1ZOzsvbKyDrzlZZeLx5G43IbIF
XJ5P6m9azkSpxkv71yRE3ndtYUE1yOQiQqjQjAo+4yHX2ljyjopES2177vs739HtkTKiv2+3vtf3
/p8iKFha/G+TGmV29jRVa+q4sekwYKOnhSnyXPs2fZzzu2UzXNmrXXpImqjNwcH4c5EotdX1Ys89
2prc2ezNzkJskSy9zfzeCbZKpmuZq1dF7qo+ro+DZ3NXXri7aNW5u2bu7+PPt2SSQ8HNg8C98gj8
nqiWsYSH0fdzkLNX81Udh1oCcyORn7yY1EFluMPEO2AhUsRtqyoMtNM1BJl+cpMiDEUIPUcS0r6N
26ecr+b1kKPi+Lx+Sj5sMWmnzfN1/Ns4K8l7iTlSJi2ZSF5icVHRyYM/JazKtsHRyUfJ2WJFpjKS
yo6QuX0QdiDlRHVaY4UuhGW12ILrQakRqgFhhFHOVGXDTcScBlLxUWOOq14vF4M20fiImdOU7slF
kRPXg8TiueD5HWFMoaVnWQIjG0bZxtEjhYdWpumBvW4ZKxhzsTepNb4EhR0kICZ3iEmC09PuRHll
EbGFHmncXGU08giMUGqBdT6jMCcg8FCAFGoUc2AkiOLjZ0l4UdkiddQIkYWgReBnPsan78LF5FqM
GQAe8gVAPbpsLx0KDxHFuRcqHtLiEHtiaghhMb3iBQgwXHwfV936+7S9c/kq2WKPVcxWrXIpbgwV
P5qvk1nittcnetWNGfT+TVVk92Dy/TgzXs2Td2c1VE3cH5rH0csFM2TBuoSYLVVKPCh5EkN8m7V7
Iljnz7OJ4d7F4NntCfvCfiE/EXRJEfWYzzIBOs0HA41vlmg5nmUG/uIQcVpXy2EWCqUHWYiwoT0P
QuNRQA+IeuEVYBYFR3uMoQXObTSdm8KBRsNHDSRB1GU0ndgOB7TcYh8oYIoKzmawqKztCRUqtwIw
kKowu7FmKQTzKzOaGg8z0ULjxMgo8TcYu9BWL1wwR3sRqLjEa+88TSdio+Qo4iblKOqerxUH+OsA
Sc8YRM06LDNOgRuOsxijkMSAlCKFQp2XkLtkElFrYHz7wXpaiSHrhCPewgiCEFERBIlWhCdDlIRG
3wQW9oQUxdDnPmX5f5k2E0R93Tys0G0gboIgRgRDzASEiQCISFMVHVmOgxijloOCG2QLzuVwoKF3
5pseRaehS2HI7DxFHKg0hKADtULx4nsNkzQwc3xZuDuGKRPV7e9NKWLKvsud7uZwnFY/d93h7PFW
dn7O93tFfx0fe16mryXElH3eb5P1kP5ODjxSJe74I/RWEytd5X3lFW2NE4knBf4SFsl86TaZssJU
8Jf4mFW8JhIRSDuIQcCbsMzqeBjVG17sLLGdRg1IjhdhBtKhRxqGbS4FDgdB62Hsb5BiKiFBKENp
2n2EkGi4yijGXKiMnO3ywhAI4wTVEY8dRuNZpFG89ldZUCes0dNBPDvLRGw6MxVjxojEIjicBrOw
0lZiLzjjAQeRDIn3xJQyKrtzY4AlMlm7ZqKjMIkcj2PibylAaUKGEKDCFkJWFCRSCWEiiCWApMFk
Cl8ASUxnAkKo9xoQchuN5owTIB98X1HeRgIFVCEFCcpBCCu87Sh73ISFwWGAEYElTrqEhPWbGJcT
yJkXMOfk9PZa7N4lyjZE0iJSU2gSUbqjeUviQWngzKDuUMOHYZ8V88Co6zqB8wzWm0/dCIEELjSG
89BEL+94w4CBBIg9GhAVUQRBRBRgsFYjr/6gsiKMKipQooUVOHSUIzLBRv95GK709QbZJ3SIiIfk
H5de0AT91BIBcJ6goHeKMyh4ijkFHwPyn7TqyoGZDVwPj7FUbQpTidxzPHa+GYUZvIxkgOGg85IM
KMVHMgR8AyFfYaIPQ8RRog+1mUlZl6vxDpzFOLucfLEVKMm8JfBJ5urs93rsseDR+0nFzSJ/R3P2
UMZWq0mPiWn4ijvMJcUm7DQZ6SIooo34j+BqTJTqUMAAkk5oMQVojKBRixkyVw0qo8ybHuAZl5uK
RS/J4l5mkAm4vIk2cVESdvb9r0TRIQy7QRfPVsjw25e0xq7ELWozqo4VR3gLZLJJEZRKLC46jxJx
LrlSlfzYe92VvkuXLzxJe1Y8YpPe2HVzbzsJlShnLRRqjoRG0Ufd0dbr+9EeKAng69Ao3iQD2wbU
HSqjuLXR+iCkZAW8g6DMg+R6jWYIQdB5HAlfRHuBPsiIiIhVVVVVVVVczn2hZAmPLniEqxTI83ck
SsiFUidiTydfzXNWtRJfk+reL6Q8Xko3eKfiid7jn7adPthTzwXX4VEvlCM536FMweJCLv8GR+gQ
s5zQZjJJAkjUcJRN4oPAUdZksAW1ByMlDoEHGiMgRtwy+XA6xwALCEXzpkOCp5FVAo4UR+Dnqjuk
OhExQlfyfN7vrpv1+LzIrb1QoEAOYJIQgMApJVH8HcazaaBR9CixB7TkIwgy+F4FuayRsnSQgYqO
glNRpbcnafur81se/WaH5wnu7OviunB9fs8ZD9FT5hI95kFGs5nWGdzUCjfJeQiOk0CGVqJJhR4y
HurnBJ33Krtfd5ux0cH1Ty8eCtbJ8HgKPUZzEWGI7Wk5aHUXG0dTFbD1KGSRkIEno8nmvdGbs0eD
i5l7vaqPB8XmydiPg3oVtDKKjWRrCgswHJ6TKeZjMZ1NbDCKaJZP5LHZnIbyHJzXJIGD2fszeCr5
r/Zevf3QlssfN5rIif283N5HZ6qPZ1nNl7FKRSh2jvrJlKytvc1eE3nq+bDF5PU+D4QyavR+5uyf
vCZrns1cy2aRJu93VzcXc+x7dmcwSJSUSR2ZPVm6L3go7vpCfsuasJD0fFAay/8XckU4UJD17dJm


