# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@sun.com-20100526141223-w6z847b8um623605
# target_branch: file:///export/home/didrik/repo/trunk-bugfixing-\
#   cflags/
# testament_sha1: 6c6a3f09488596f0a86d94cc178963f134331f8f
# timestamp: 2010-05-26 16:12:32 +0200
# base_revision_id: alik@sun.com-20100526103441-lvfydo7647yzohb6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaFFftoAE67/gFWwAAh9f///
f6/fyr////5gHw6jjagcZ996oPb75j68rZgNSaffe69Pezz2S0UPXrr72+j1fW59K9769vPePevm
yFGaar652RV63QapkDbazx3ABuZycVPXXro0HwkkIExA0ZBU/TATNCSeEm1HqBpoA0ZBpoaCSQRg
EI0Uao/SmyR6j9SPU9Q0DQADZQ0aANAyCZTJI1MZJ+qek09T0hoAAAA0NMhoaAepoJCQIhCZGTRo
p4U8RlHpB6TEGgA0AANAikgJhNBoEwIZBTZCZAk9T1GmgaGjTQDagkkAQAmmgKehMmJPUgaAMQAA
AAaZVZcCYZepgE4MowfDFmhn/jZp2EWs2Ou3oOfHE8jm9GfZyXP569QWQ2yNjDokQ22NDau0RJ29
l31+ye+X8Fcn3YcMT/d7fXk93tZ77tyddjUMVf85PGGTL4LvXhq7wYt22pipQhC7qpryyqyxsUEF
/FFWn1+W21cuuTy10dt8avLO75aZ8mZOKSOZ5YsPZ2baSbTYbvixYYF2gRyxvnlWWZsScmVysULP
CvKrSWuSYvpMS0ooiquz0urREFwRYCyii+YcWooZKoLOXmmxq/7W0bhAAPUuIJyUDhruNmBIohAw
Ngd8ZuLc3TYC39ysa6QqD8SARujJX1r+xEaTnFAhOnH+fnd99MRnLuZvESPeJG0SGEzMzMMw2kNt
tpNjbbabbbE22NtiBtNpmXpLOf+CBW7zr46Oc9UrHF6c3Jk8mie+K2eSE5LIQqcHZ2NZo0zF4nmT
fdC9t9cMSb63cd5VLhbFadm3px8LkNmoPbUcxmWcmXpvM09pM4hZ7chS72dnp08Mp3enbabsN2R3
L5ovas2LWxqrEZs43qWxLu707OzrUMOnHT1eXeXTMunZ8NRs1ttUdbyz0/EdnR7u91LwP8WVy99/
P8OutcApN0W1xD4n5+QxiZPZ+Xze+3NPZtMW9qyZ55H79uKzC6zKSt5ZITxJTkJG8Xvt5L8DVNMc
ZJ3aLPwPozpRuKLCj9GuJucmR6xIdSdmgJEnsyzQ+cOeVz1UvjxVJG2I/stoJp/rj8kwSNgLUj1G
l53FG9ne6m1ix4ogdAKyUqluhCE0/Jdk3qZMMLnvOHCR8DizdB3NuI5zt8l3nVLL1ZoO+WiHlH5Z
r3Qo6B5/ByZkiOnpibuyN9TETuccHuOdrudgkNpZSludqwe1zoPq6cH9DzKZ5/J+SoZv3SE6Qwwp
EKgfnZB7HvMnlB/JPCR/DpfyJVSo/uZ6SxzL2mfRXlXsF8A6sQaZ8zjdEGRCRTHuwqT7XecH75r/
/P4fGv33ksV1fVyD8ZRChV/VV8Fgd4cfuZO5qmsRwnuvw29e/tMu1nz2Ls/K26UKmuIGYhywJ/QQ
Z9Nng1joiIYiHnF+z+WYzwVlZ9k2JOEMMne4b/V/X5RBGAD9DNwZmGG9hIbftmdOWQyh3sMkQPm2
ZjpTO8v1KGPN2IYMvq0uRxa2YPo0/l3Hw0GHcOzt3+2L2kNd7koZJQ8rqih8Laa+bi0sT6g0uQGy
BnxNcw7yH6wNCDCZFFY3a4An/fPEHLNnC2x7cfbe/s32cObGXVzIvaTQ5uHMHQebvYMHXO+55GrK
hWUVlQrI8nGj486lSpgjeNDEzDxLsjCqhqqQ4BhCQTJiEC0QAiYZEyGxHQ0r9GEjnf2ytnra54xR
NYEEUtCD5Xug5AOFg0wEiLPt1Gx9juptsH1AhUsOaswKZpiRZiu0rNArtAWsYtqXPmXddprOpfVj
O+1puAmkWTTXpGay7KmhoEmvWMjEK8N8lkAGgFYBNaFLl4bbNX8CZ9NTIwIlZzFK1N5phRhZaNCE
xzk8sJvOxfnmNbowAobBSpVf7X8aoC53Gc7FrvmW4cVKiZPUokIuSRVhIe4ZBQmh0WRe7kgVQ2Vs
H5FbJqqWNwodzoaHJab5ocaE3R3mGsA0KK7xbFAdQ0BSuJqwO4CuZXQgKYEsmO30KhI69ZIuESpu
bl7TnDgqSKrbNjUODUuMyw6o81UJ5d1pzXfsp7yA8QnshHB2zmyMMn9VZzUszqfS1VG1alazqoXq
4bkV7qZOveXFGkJRMBPrqXu1gwAt1dcWrpllE/sHX7ukNtVpZ6+e7k9bpgsawFwhnRUgk9riha/B
sT0lNsF8MPs0gBNqKSetiZpu70tPA7TwvNxwO32f4z0mPPNM9lKGeCS4FAglyE3PGoMLr5HAzKVB
za8wWAFDoAK9SRVKeiuN7bd2gTOTBSwy5iRyHEd4KhsVNWb8KnZdLrQ2HjFTzPqcBDGXdKUDwJlz
P42DHRFZDaHA4ro4nn7VDY41T2Lw8C5BGQFB1KT2obO5h5hIlYeeBwVOhqcljHRKJiokA5AiI48E
2J7u8nMAUC8yuOy9JG6GzkBYMMcs+J2c99oJ/DnYgdnuhOE2poKC0dwilkgzGSSLGQAQKtETXUZd
HPIaLVevKNDJ1FirRN1tDAZS5XMWm6lRTSmAJuB6UJFl7UQC1utCq1NQBXrHwLKycui27HOWsqCu
Msmpbg59Hrtzy3KmXLJjoeJiBCJa2OxEkaVB6QKRQprzqibziMvuTidBtV+PMUqE4xta3xR3jfu/
mR+hbLwOqwPI6jbrcy6jsdCChfubzOnBP07bA9ApXU+3UwSPMbmDC6nt8CRc+PJtC0CJ3PPAiT2F
5sNR3mDhz3vSd0tx2bnx40xEOxqQ4Op2Z3TBgDOYKm7V2zgzX1tnGAOuuZcGtD3LmlkWWo8VW19O
qvUgBX3KNkSt72kHu7diEKgSgMoDAK3tUpBDLa2psPMbsrKI+ZIiNEUWcQ5FLMMrRVTj5O/CqmpB
aQWB0eWSWCeqGqjpMdGeVitCcjI7xmsTEZgzc4nOuBWxlhcAXCstrY5h4WMg56imHWlTkHHnxz5T
swsfajV5uCJIlwNVnnpstVWZGZQpSpEnqULRjE4hFAxuXbjbQMi43F5XMWlRlMhmMxi1uudoQ30I
Ydb8aGTi3PR6MHmnplwZQ6FNNrUzbWGouULZHwu5majzQSjSqIzRcYs05RirrHW1suB7mZ45IXLZ
cB2xGN1Sq6BAAVivlK6LOQ4wM05RkmIyW7kW8iiUQ7mWBetxazlyrs41sgnCtJkmdcVzf6Z1KGam
FYnXJXFjzKMacDzrrr3iALU4JA65k5KqZRtyOu01Pg0JDOg5jbpxsKhr8nsbY2MG2m31JI4o5YyO
KDzb32kTXUmbjion2lzCBcbz1VpxKGSnsdC80Bx5IMFNdl7BuUlLxluLuE1RbvYKLqtO15LM90fM
TtzjDdvBO+TOqdvRlJGVciSLYcsyya7qjaNeebD3LG2xkOTMGjCiKMES3TSBOReEVcM9oqCb88BW
sqEOXJBOHUrgViYOwwOhU7kTG/ocRscSN6FhmLCuphBvSTLWyFjGNNJP5LChNTMZEVEBbEiuZKVE
Rwe+hEqQOZXDeYl9qJjzqtjeu5SODFVJYEN5XI0LDaRllaSLCPjzW49dVsuJYorvO7Q47NufVn6v
Muk3tDebijRq4o/OsdPW+qhJMHvVFCigALxKl3kFIm4QLVR13dOO7xAFkP7EwrZSpm1DoVhjCimo
7ywtCNo0YjqD4VTjIohyvXHOuMaWHTmbKNuB4rQqetrPLimZuMeqfEg5o6m8ctBuCqOKSL7yrJxO
RsNa8mUNDSRQoWyPCT2SQ+Q4+UaByC0NLDirS4jeUucNFpEiolMHQ40ExBcND6vJqfU6Vuih6s9u
Mfe41VyCifJdF3J7wBdVxbPia72gHSUSI942yowNDjoIR2ii3VrkopzFCNvFiABR7bZziKMEB1GM
R7p6F110LUQYkF9CLPTExgxNl1QZRgerIak588EoswoTcnbmvp+G1FrLnC8O5nsXOxjM3OtdbEgV
NXXkAdwbQsq6jm4E4JnIRmeEnU65+7tKfX0iok3dLYWYqMAClHlJFfAFWcFAeazSnFZjLhz55+tZ
zMxmICYzGRzHMc7Dwdjjq83s2vJ5OXU9V5B8NAsXNadYYde9vd4vacWi50XE6OV6dL3nObTCGRhN
jJbRg0YRSauXMJWGjKhY0dRm/Czy0qGiecHmFsGGbRVPMAUzG0hkcjqdbZ0cWzO/MxJSa64sNSWU
dYlsyigRCkhrjcZFph34VgrOTKBzsHlSZkZkzwYqajEjet24Y4rxmALDrS7uvBbd5tpCTnq0Wc97
DaxtdCJsoJlEqpCJssxmGW8vvkzQEW7HVQoXyVjKZEheoCkYnGxk0kahuTIECoo9TI+tCZAIGgCo
aGi3KmIDsEvhgAWib4AxUhDIVXqFvGsXFYTZbI6hicXDhjUoMMWNh4240TJA6FDx6HwqpMoONjbv
x4LuYHXOQu6memstzn7ShGFL4qNHqBIVHD7mu63BmtTGUI2u3V7VvLBZbIoSLpIzToBWQib6I6SR
pmwx3JVbate7xVZ2wZlxyoFFJE0kIegDxG/BjLicljZs0fCEBn5t3qh5bXO1nakh+JD0vi+kXn9B
ro6OiLXcGIKNMYNg2xjGxsGZcTjGxNtptiQNHuEiXXH5fj+cSMAcm61SwT9dGVzOZdClWughkyAW
cP7F6f9ELxeP2tuJckRJNpNA2k2v8I9Fvztt4n4+uf9oeFE5AyASKJ9vLxqv0EERP1x8GXXCBxpB
nSAlQNj4PltE/4F0dI6e967kD5iQcCFsDgcJKoVFBHcmBcF6Ubhkn8zOyEaRA/mVJXUTnFfSwQsf
NUwqmLFB5EcHxbA4Qo6t1gef9qHI7IiixkMzML9WGGlAvCFaL240x4evl6OyggvONu2C/P7/rIn7
h3plwI8zkH3G87phHafRMw0txnfvGaIdp+BHy4t8fiKlfVU+HBr6l/JGi8xyR9KIkKzTQhgGZiIu
rWaBMtXz+ascM5tKqqDguYRv9CQCIg36DZ76kSASOCcc1qWLHhIe8GgEDeKA0EypH9OXrBNkORoj
Of3+dnTD30NWWT3HgRHHrJncPlI+4sJI9A4onHJ8p7j3lg6FJmpgmakXg87BAobET4ihHfMQ8U1C
hIuUH4MlyR/GqxYCQmPLvzeawoIosZMatJMhjRAsIzEXTfYaluq1z4DcVFheWl4dXeTFw3JcKQIE
m8OGG6E8P8xliRqZkyZtr6/2DvyGcUgfAW/kibCxgqA6hI7bgHyuHiyeIicg/lHRkILU28OyHcQB
YEQdxVLzZJs2TIkXk2YSnHUXCyLfqjoQ+Y2kYOXsaM/oypPYDFM8gk17LlSAKpCUpICjb45goL6x
qRLqU4K6jbZ5PXFVG80F9jMczkUqcOtPjJjkVjyBgLQxq6nIKcI44nQAVJlIxnjXIuQ5SeY5vIkY
HSgnKyCRGU8Tl5b6S4r0uxsDm/m3u5N3fnE/50vj6VNvp6cX9tn57/fhlN9h8TEmSuWh39HVWdG8
5mfF/vRcYVCIFZ01prAhOXOz48kChWlhgYYSBgYfAl8AjeciyyzSdj0KCRUSKM3kZYtOQeEhxwuJ
ygnL3KktMa2EpaMVFqvkFbeYsxQbzKbkqMr4c4bchQaDVzDLwBfckSW80lh9nE0nz4UFBwpciQQE
EcHk3NRoDw7U8029XnR17sAGN5DAxWy7fvqfP6MT5/Muh56HSW6Apmd6ON/FQVF9BUmAgnzov30Q
9zQNNcVUqmRHR0DqbkEzZHfBxflvWGOSvtJ8lxTKu9eLOUeDGbOYGe4tj06uEUylAZmDYi1klCZG
MNoSnC0OXbTFhx7aFlTzThxcXHsevsRLjQonGvoMhhqHFZDJ4lwAVyoegYGyYl7HEgwg4gLUuInC
7AyMSgyWopA00mJoKS051GrQdfkzl5B4mY1vB1fFF5mVNTM+BzYzueT3+gLTI4LQ4HbEyLzU8vmX
iPqgOHzVNF58qjq/e1J6el/ezMjua36Pk0h0dogWWLvRZLPrqqMvPP61ri2mJTTyBzX7Dk8SIPj7
T7OjAZ7OU67BhePZ3wZqUsabTFAGOYRXOi0JMF7niR4Hke3f3mxd629viO7DEhpkitYKR7/YqoKY
ZZxxYuJSRcettmXq7clV74tU13JFrhMX6ItmMwEwyM5zCzFWYNk+lXx9pIXAyjiywqK9gZRI2CRV
cThC0QpLITE7G18FE6ziBGSbSZjcWcTUniBhE8WXgQgUNjCvovRYIpdo3RzurnpovowGTBqw9rZi
idTE6HM5R6HD5aenIlfyo3XlYNeVQYBIp7nEHXYFrno0ajZydQ8XhjjFr2u5P0otTQDaBKt/Y8jT
jnSSA+/wGH+PSeksxuCUQAyYAcyeB+g1zwwZtvMPXkaOoEgJZUqLpivhmm0rinvZolCWJcMumfTe
JDhvCsnOU0QSgFVmsn2AyBOA+xkyO8vRTae7F425Xa2oco8nrNln2p4AC+J5BI8TiMfAshZbsRIE
j0Oq+K2QOKVJoLCoxIcOJ9JHfU5VzqexZXpVTJgyPOp5ETAc2cHZFS8eVNwWHLMtHq8tOBE9hwXE
DE58iBsVGCp6VFpBkJ1JNJMQXmgJy1U0qdEOaPcJE3brsR2CQ5CL4kdvDwaDoZG8Gz7lBaw3cvsj
vQ8cULFv+p0YZVcDK0OR9n1fsh4xxv6wTzyNcBl+uRqe/k+pL5W2+zu97ycTeDtPl5PugFUIhslR
8drZOXtmzQ2vc2up+Th3a3gmXrlB+CGml1PJqTWEmRra0gwQxDx0Wb3SfGjMaZSH0ewzEQBzYQk7
Xa2XUTufozZrAoe5qaGzOWipHnvPekDqiYCJv6U6LmnaE1AMF9EN/nJxYBld8PG04S+C8mtsOThk
auzwDKnm1szV45Hn2fsEAtQzOSR1t+G4ILspHNlmCKi9AkhMyOawHIqoRseFTsyYG2AV6v7vFAZ8
3xu3hR4H7P9CIJH3zqmd7Pi6liPZNe6hnGkQd/76kQcELnJyzpvXHZ5fGxAp7zNpj1MiXTh3YE9P
PoNzDMNTlrMbZ3Du/WbHeFdWFXuowAMkhmYT+6juryEIeMAHoFlWsnjxHxI2NPsUuUWivo62fZ3m
Yyvs8291AsUGD6S1Pm3dH8W0qfHToeHV907xysPn9OT+Dd63ux9/jEHPlqJtbuO+Kvk5WQ0+wWt6
bUJz6vn9nn2fbU5jN51oPb7W7fD073k8w30aXYIMqTK+dJrjzlEpSCHQhCRAkAYXB6sM/NlkaEDM
wBXOPzq7JYJTbM5wliZv0/GaktTsyz9XVeno7fXW4cKhGCAhI0wqBvwBYrgiRijw7DX2BX39yr5H
3ZXWfOJ4FJ7yXlER2tEyN9ql2IvFTKxBwhPt2zyq1ak/OXaJFtCI0cA6Gdo79tXk63Kl5aqBQHQI
CuloAHI1WMwhT5/qhNHgHuTAcFJlQ7yRW43oxEjXZZLsBg8DAUry2jKfq7nx1PfKTKUmUpMq3GHB
PXd6IaFdyfMgl7hqlDdkkFjSRwUY9GhBp7DF5tz8ua8ZZFlef7xb6nDwNy1BGG+aZPbFbvVNW2vI
D3uYc5WRQvRIDUAk8SSAr0/fXqM6ukjtaNkAnsmL0uBXgEjhv7FtgLQwgoQqlIzb73TO8gt4M2+s
4vsXbTyi6BsYwxODpFG/TyQTj31X7gd12VEEh7+ChNbeiZYQ9KoMZoMHIxer09EII/ZQmYSIYEYK
EkygBq6s5O+WT4PBuPN84SQ/tY4s7reaGtuaHomuD4EQQ6zbMztdJ656T1il/Damhk+jeJrdrgGU
sC9/BfcxeMspI0e/OSCFVAyH8ITYIGwYA1Zp00bCCWpODPD2SXb+vkkyb0BiFQ4uYnbMDUWxUw+/
vER7y2Y8N+MPdqdFN+yt833xcjwz0kDGkUDXX5M6XbtXcn4s2yBSAGn7qAKdvszV11okF4mmxU04
9g8t8nGDWmbBzTTv3Id9HNi93pnZHWE0FJU6qfTiZp3yCpjfYhTdy3arW9yOnSd+YtteTW5O9+D3
Z9crX1eHYnaw5oZpm1L2j1tqxeroSH4PbY5KXkgHic0PJ+e74NOL3PdmOJjKUiGQHBfWdBgYhiYP
xISm+AapDggUXrWlPBw7lndNi01OApSSDPk5kQD9YGRSoJQ3MjYsywPZGfeBml6w66CUBQGAUHkp
EOjbm3pfx8YJIxrCxOJ09C2iBQxGV6HRpMj1Qoano+gMsnoXZ7Bo9vaNMs/e0LJIL4Qwkb2dCc6M
t5ExdUSIZpCynwbvZuzs7SsupXs7A8YbbOwgNnSniyC0GJUoWb1YiMbKCqqi+T3811fsozspbgnr
NRzMCe2MB0ongiEhIiB9jpxuxf4AYYvJLdh06iDtuwu4cp/ZsZKHOAuFLedDZnxQaRT9Bxo2jmgQ
lZvfztTdYeWxrGY0ojvvpkkjckkkkkkkkkkkkkkkkkkT6lUinYRB47gXpXkUsjs6e3wplCQw5xPs
Z5Hap4SpONeA5/oiMBrCLpoF3784Owpavr93F/JUCjDy0uzq7nMdiZxKTPhu3S/u7WeWBrTdJ43m
6s8+qOnZlUaqeOQkk33oes/dWPcuC9asG5TN8EoyM1gpZPInKPqCkUuKSypGmUkNnk6Ha+Dnucwl
0BAQN8OEQe+3Vo88kqqAU27UL3RV51IhmNUDAPxsgfu5OEQVkORmpdHoLLUDCBpFpnvfo5UnDF2H
FUgUt9cioXu9kuwXT8LdU18SbFeAtVpEBbno1he+S9U1m4hfQgDiTO+/Ot9HjLLErn/2d6uRD8Ch
qq05eJQ/a9/GjaqYY01ZOG5NBcHchL1NvTriubci79GI7wBNkKML0kBTdbyQjRDCbJeDVq/Gv+Po
lFfBh8HA6F0jJtwQv8Jchc9SZBM8rrlcbGPg+AH/V+TKNyfqqz0dQYsq3uIb2NGR2bGvQ5H5ss9d
2CDoeEz+ENWp7ny/KtyLY7g1OHb9vi8wBs22bHboDRaFDsEnD1ZJVhmbXQztmm7ubSlxJs/DBxtd
NrB5Hjhw+blclhse97mGrOrizKFiUpyUmE0hxp18ljCvI5YawyGi+m4ru0rcsVBpbN4bm5ub3Sya
rmGMjBk36je8Dc5WhqyJkg2TEDJmkaiBdU/n8vHs53BzsnO8Ta+DxwcHNbIDS7GwpOjxcQdRKTg6
qhsHBg6PD1fB0MaW3k318nhbTJ62PIvAHW5jPmZsrFgyaoVN7A5W6tjDW5cHo82l3zUPFmbvF0sz
obXLS7nt9pH6nICp3y68QRf+LuSKcKEhQor9tA==


