# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: pekka@mysql.com-20091127092207-xw7g766wsa5ovno9
# target_branch: file:///export/space/pekka/ndb/version/my51-bug48910-\
#   70/
# testament_sha1: b8e6f33dc2e0fc5d891013da5025c5f0c399de89
# timestamp: 2009-11-27 11:22:50 +0200
# source_branch: file:///export/space/pekka/ndb/version/my51-bug48910-\
#   63/
# base_revision_id: frazer@mysql.com-20091118231419-2j8m1pqdohnzig7n
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQzzzTcAFrN/gHxwAAh7f///
f+/+Pr////9gHjy5Z3H3332++B69uS2PX3GfeOtn1PmPbjs+7ctrdjbDQAoKBK89Jkz2yO1EKFs7
vu+nvYAFFSH0tY0rVNSZZZ6xXQ0QxIJoJiYCKeTQmSZHppBspkA9RppkANNGnpAJQmIJoJpDQ1Ue
oDRkHpAANAAAAAGg0yBCVNE9TNE2g1MBGjRk0xkQAZAZNNDEaAk1EpgppoASejJqepHpPUyPTU0a
G0Ro0DQBoA0aCKSZAp6aT1I8IRjTSn6U9qno1NHqh+qbJB6nqe0pppoYQwgFSSBBoBNGiaYgGkma
ZBE9IZNBoAADQ0dm0QEhIeSMhD/3uHh32FiqHcleHnxplr7eMeJSeOmD0AcXEPh3nZjFL+mgAtD9
nxZFndrJxW5Lt1/s33j2iYel/tCg5m0DfmFkIMtuxJKpq88vUNf9P09UvM8sU6igH575JRyd2ILO
1nfVPx0EkvYxonzrL93AjggKyIABZu1vzUgUAKHSPdNAFgZXb9jvHKHPhOp9dKSDHCbehtRgs4jT
F7lKIDgl6GEduExly8ut44Kldu130BUpfd6SfZAmuFVoKAQJmAkMeL5+rk6ro4a7K6mVm7t4XuJx
cQg9etBqIFtW1VDyX2U22rDavZ0RLOwooYUElUszbymnJQQIktosBRCuJF2KAWQs3qqcy8U4DNAw
ADaI1jCkJGywd8u00JcyhKNNgAGHpEXqWycUIy+k1GWRJLNmma+Ru7rMzMA2yQFqQ21CqQm/9D0u
zxV7PL9ErwloMvRZE6TkJEU7C8Qvyp+FCVFtAxD8uuXHGNkpR3wASSHPO9ww8Ng6J9nIJWRhDaiM
CCP4BEjaiWICUFBYQigsUUUFiMk1A1vVhaHGgOzn27Okico2VTp01znXmq28WfMBAjQYgzX/Z9KT
qpK5XFG1XL4pAotG32pBDQ++KFJphwqKIICSchzDxrUwQbQe02OpszCZvGFeSFWYN1EwIlBEWQEa
tPSC2txJvZI4NmUreXhiWtBYBUpWalUQCZMEAIZjFoVSoIzdQsqLrUSTraGVYWNbRE1OdtbYzIEH
WXpQLyGWi8O+BdjEKk2Tg06FUEbnLZms5xA0azD6OjesrW+OZUHJ4zpuNkcq6mjuabGWaGLFtmSE
M01FT3wQdEvL9U3lOIHJkczwSS8zhe7DB8SQiiGx+7iRfwN1Ygjqje2n1aJtsCgm/vkS96uPeHSY
iv6O54cDnyyA5fPPrVVSKCjWJexx3Pc3+OPeykMaeexq7RDXk4p1DsO33poYFTagGyDuvq3U8/TX
QYawBO4XMUXO6cSB5jcVn4UE99nyxj6Qa9Kee/AFEQovoR41ANsRjvX2PfS5J7tjvvuenOP+ndtO
Oh5gXmYZcQdciBG1b9+Trrls3BznM2QppE2tN3G02zi1BULwCkvSCUdtE+7zC6Y4ACJIpJzlZxYZ
iCFcaX6RlvvuVGXphYr21O20J5ZZDnp4DIhdyZgWWbiZ5hPsFqpS/Y503zr6e/sNJCgRRRRRRQ7s
n6qddvbNOLqZ2kfWEM8rdaXQKZ2fs5c4AkW21LTvwAAy6bzO8aNTwhXJX1P227BLO3VNLRg+tQc8
B96X6bHc3H35Tad5UEbiez0FyCKQOuEuYbVCCP29Xx+Pp5Ot3xeB/X2R+GDURGXFr67gDlHEQyfx
kEn1gd4En6AITavtCV6kQpKeZZpymVqScphG664Xh8oY5TZdFPTZBzWVU0xqqbVBPpq2LbT963bc
eQkr7fQOr47Nu7hw338PSPeNkm0MBkEZ4tDQkkKSSPvEH5nv5/hlwgz3derEJYCB6FZ6Z7svxTNL
LzpCy2ZzDAxLM6pqt7zZ4LkYM+uxrIjjyXKfcrAwWFBAdkt1cBDH6HT5F6rFol2ldK8SCfM8Lu0x
xqp89zSQSApXs731jul46nOLjNoqnA24PnS9b6EQ+Nk+MbpqOZHtRkpIEaJIAuYa1rt/kOaeIIrx
M7bjb/JwOJtrAswcOTLzNR+7OfT8WiMK76zgZ90jIDmFKPxCqb30uAnqAuEkfxtGj0AUE3AVoysF
KL34v7wONoVKWinK8tFLEbkf1AcXBpK9H5RKPRGZO7fzfFvpTi4x4VWHyEgTo5tRs8IQ8qTowUEq
HPuY6vMMlZjzc3VECcYezxnER9chH2gGbl4hJJIJJJBJJEoOAG6m9w+7w/FxQ6rosBfD136PB1zW
rd2ac0IJEh7bJTC2kptKzqB99KZC2SaoZpMIaJDTPOzJJhW2YaSFJVrRDge/KCiszDOIJZaUQLYh
gIHQFYggMAFkJCzQ/UZbtxk10G2qYwW0BSWP062lGIn1+5pFQJOFLHBdpWREL36I+BT4CzJa9/a+
hPwFKugMIhIvApwkNeKlKFSo1etU4qkkiwy+xi1SF2uHGyY5a6ceOxvdM21S7krVE2tTBS5l7XBs
aG2Jo4z3RMpfNuu1cQTqicG2AciYMFUm9AzTJpc6OTFVuyz0yyLZweNzEjdQUC4mlTuxfX7WWAM6
2AvLTW8JBN8I1lKgfSY7Ma3QGZuq5IOpVHk0HkRm58L0bHAUijYyhbhSqlQIlJmVPKUnEUkeKNF1
yyNO2y00SqdwwJC+gdtzT2dJbfas+a67xqMuG9QOpF3RbmRuEEwpx3odFvrvuvURDKIGlrIrJyay
bF+ldJtTkYoLThWVYZJ1RH0HJKN7iKyiqC9Rjg2HLBaKLolLDqMUu6hjKUoyL5d712GWsrkOBi95
d8pis9bdsb8dsrLNJNcQXIupvWsrquaGnDp1SGzNtbXGWbmtcwbHBcfORpdyySdGpg4dNLaLhgCP
CTv3noylTa4EMNSxTjS+LNoKoGCCST3vda+DLUo9IHnyxKOJhA9VusbLUQ0ELQImjZfDCrsB0FlJ
Fd6rQJ/JZo0W3Sdy0yUwBwZdptpxZvm05IRrBCgthz+SlIslDOIQOwsu5W2rs240A1SFAbXRcInc
JLiblDc+xFs+XLXedc67GrNFrN0xXSL4lSXItT9oEj2aJENSgiQOoGide+iaJPJVBALMmxMWjqN3
0GK5MtdcrA11hn5iusupp0UO0jDiqp4r0MmYyQlyHp1gkqMCJF8mpkqXGjW0NLa616zUs7kb1zU3
O2aVTNH1o65E3AE7QTl5BiQKUpxNgGvZldCFb7E+ho3M+Ug7KVWHpRLKmbdl7GqOm2oEXjBQJJRw
2Misi9xCdUEuxZakxck5MUwOkuONah5mKUkYQh1a5ZyUEhl/cjIXWkNoKp6DdcdceY5roRWYjGxB
hp4bFzJpu03uiM2brd6Ti2qZuwxXsWt7KxqEB7/KSNxBsADyC4EW13kU0Mb1koJWa4STlXZ1mLRe
asyKeoHblwMAKIlTNh1Mi0RYRA7FEaHsWV6Cp6GmBCyQoysuqKdixcyW0sgnfUgwTqaVVm5OkO6c
Gw28WpRQ5S5YwfFQQyvj2VTwLimM3yXFMHJ/FA9BVE1JNiCva5RcYTOQu1MmTgucW1gwdbWuPLy7
Gli9Y6gGQTuIN0TBvqenLRuyIrUU8nEeVzJq0j0w0K60NwDv4ZuglsLhDumtDGacfIAeiiG9xEI6
7bVKjHkYOnMmjeJkejJQYpwY5l65KpceCSgzrKMWKiddnMIJyo1dFGcyREQxwTcNzrJBc412MomF
2JCCOtBakoYKFyDJwWKCJqB3A94QkBkQ8BC9cfJOeTKt1FaBnl+Js60jxLDLzNIrhrKxReRMIldE
vGL3u1qVrp1yKSWLxS0LemaCoiAMLVmRPQueLh1NaljXNCtcCSw3ngvSNyaVWBsPd9SjnGW00hFc
8ji9zSwwFLYw7rnAqSKtBMDvR1ERTg8ivUc2U027eBlsIwo2u5JqbGtmc21odXYpeyYsWh5DJyeB
8T1ENgMJ08QWarDdTrR1x5xS9SSJftWbNZXYouKgYKyys8D0A9PcQRyKzpTI4CMjCxibr6uZHlc+
oFeSiZS1Bytd/ogPU2k2FPPPfzO6ROW3w3cqXv06SiQdgG23RPUUE4MmqbFdddCDU8eC+gQa46jp
kqcCXl3sQPUkdOiIIsJmoyUvYLm93OawbGpipuMlnFtZnqB5+KMBbCTz1xwUyI8upWaumsw7i06d
alqRYaaUrK0qnI5wTUgqOe9ZxJrRhUT0DwMDjlxxpKNUSgeBqaHca/kcFRjg+WpJ1gy7csyampNJ
nSopub7jlitlUwal00LsXGOgklrZZqLoICm4xoBTsSSZPAqOOcFDYY4LnwpdBPYiWfGPqG9M9YM1
1ThUi2LuqxZ+ZhUpiuGZotrl9a5TCLLyULWSkkiyRqYOs2tebVlErQLCTQL9ktoZrpwVz1ZO/vzZ
5trqWeIuw96JApsK+gwdSdo0WHqraEDcGg1l7EGTk4tDNaJe2Mmhk5tDF1RODFpbWL6onW9nSeP8
F36+ThcTdtbiuzgqqIxXhgbBugE7DzqM3zsOkSo8/KwoQCM6KGsFrx8HGNwRKDwcerW/lBDrRktp
Ge09Iw17bs6maRnBm/5J8vorohVFuZY99S3x+fb6TzAHgKhd8f8hSUoGQG99SBCxEMIP2/bIAqh0
tFE9oECHwJg/wViVAw0y1XioOqyon0SdE9ID5licwA1IoCG8BlAM+2H2hixGLEZVRSl0ikk0pPIf
yyT6h3ixcMRcFzIYS4Y4DwTIYz6DGpU1yxEeP7gnXNQZIqxWSKRJ784kX1f3/5Lv1+bKVagji36v
o37fzwqm7J9AfVoHPpPQHYCP3NpN+xOCNAZ2sO1vfxD7G0bSPH7/zAmTjQ2664XyJo/QpxlwGdvM
dQGX/vcmsW3UHQvCHMzEd7A8xFABad4ccgNS1OFqu2E340ICLpGfI7DReRoKiUkm3Sq7t7e39Qyh
1zdDoQTOte4UUqfk7+sD1xHkx+hTecbb+2UbYOt3IhqfgTumFnyHwiTIiifZBDDS4RwUkoQnupI9
6kwWssMWoWScF9cqbiZm6QWUExC13BYHHgLYGJhhqymKAwQPX8/5/Z836OBzCvGbWQ5JiPJBQxX0
8pwFVVWLCc8hoaujQV09NAbQmcmud/8wr8/7XJ+14L9TgkMF7sWdRcwaFncwWlZI0AaSvxOj03lR
rKFZmJGSqniUM59XsdLc1qc5qdkuaGKeVNVDqfbg6ni7GxxU9MTWOoAgO5FhDrBYFhSAJJEMAs36
kcfeB+zY5/Kba4XOzs1VOeWJwAwOli1EuAuvQSYFnQBKZMNyk9UZcUL9dTdUKN9ozy0OwuM+FRbS
ZVLWgs06YHupIcTHGTdOxHz4zQMu/PZk3OUwmON072TJk81z3TJ7GsvdHXE9bB72k2trJeXM3kvU
xSYrMm17/fVWSYtrJrbpJc4xN9pGw9XFvYNRpcnFpeiLyDX+jQ2c4HgpzgXAaHFvfmIrhgNDqAnY
ww/aKeY6EltCnNGyJ96SD23O+J4NbodGI5ujwU8He1LKZFzQ5vKR6Wb65y5TpoamK7tape0cVzY3
O/ka3XodEdbyZmtoGnEb3u+MjEYCkaiWqRhyuHjQ/3k/vSA0UuUgrgqWOoJIlmQsBzwPcJOws1YE
mcnKjse1ZaoPlnZIXeDw0OB2ieY+Ak6ju9veZsXdEp6nrUs8G8jJgzbG6RPUyYshvetseAk6zvxG
lm5tK+RZiLSHrbWA+e0OGgz7h5/ExDBFH1M3sY8ZsauXIDeSA4Ay4GOiimyoX517UfUjwfOJp61H
s7ztlBUMdsr59vzTJtkeBmHw8ec4oPhA42NNgUz5fAwhKFoA71C+sJ81JhQyy2GF9mMj4N73vh2V
yu+Pq+6z2tLJ8T5poexEOx8w90k221bVtN2hsuqzvWVNzQEoe323M2xixOjSs6jsmyR3DpIdwcIz
oYikuRHSQqRD7HFtep6e+a9A5OTitE94Tq4ublbFnIZ7sZWQjKkOdwAqHHppeCMhrDHHgG6qySQk
5L3gZlVL1KDjFdQG3I181rrtbR4ZEmgS6fGB53yI5PFJ0uhwqE5XbtdvKwqXOc8GjbG/qkapvwLw
qg2TTSd6s++0LU9tKCh4bArnFhX01jCKip06kwSb0Wbqkg7YzSTWjWL3m6k2pHxVvRhgy+211Vpe
aSXYYep73n5+DBT4PgsuYvg0MBwZtBuZsF74MllzhE9zW81mClPl8DUbWt4I2s21Zm9jn2cFWcSN
zROKWVIW5JPAfrkcZ9JHgR3V7RS+V8vMfd60zmFUGjxRtjEd0mT2+u0qpZFxsiWHt7homC8k7FoI
aUlSRoGetR45I85IfW1DRP6Rl+YO0exHrqkhSNkw7HO3T4W/JY46fouww1YD4xPRIx2xMo+2nXWZ
3I098uvpKFFKRq25A9SPULzqYlmxVC7AmFox18PVXmA2RVbtHD0jcNok45zLWGs5UpVJ99S05xPn
CYx7pv/TKLD1ROO5JHbI2Qa3TGxjORJVw6covv1yk5JMMn6iaNy7t8xiLhrqG9UDcofKJgBRcUfN
K/XIlEoTbKRGtUZI1Uk0Iw7vXwvlK+Y8Ufv7qapGq4fSYwedxA/DYjmE9G5TsA/WLv0wdQFANMCa
yNjAd8OvaqDyLKoc/Opyib/lEwmC2WqhNCfAUT5ybJhSu+1kckhPmw5o8BPxSVPrM5GOipPV6lIq
Z7297241DnI+6oHFsT6tnyH48Ld07t5abo3vbXluF6TnG9yHxl8ZYyKLJi+4axokaDrdQ+3q4c9X
ZFUKIkkgk6xn4I8hzLvIUUEUWKsSjxo/JLWU+KzxlPlCOct+ZN6Frk063VUhfP6x9BeGgYyHAccr
tAqJ9Uhf+zzk7w6APkJAm05TMB4y/O2XQD85e6+NxdL936wKrOFsVCQHpE56WFCihazZKJqA1Fyh
Ya+wDINAOoap1CTnA1kOXbtSqqJQstlkbRozGHCRcLHoskzF89A9w1aNGz8RUsaq9kLxnJnMpUk0
NllkUS0StlLVUJVSSGomm9eJwHwmt7VUefusMbTOJkBwE575tazetwtJDqdDJTuFnQqLny4EnKHP
FWcc0kTqL9otURLYdLkXLrth9BflN8No3ZzOot2yoHB+DTdWMkOqI1RN9QDYp69YGphYiCASeGKW
zkyB9wEnzfcPnI8Wiqv2SNUi5ZI+xPCEeMT46NjSCqNCXCdED4O+AFQZFkWRWKgiyPkPkPlIl3Mc
6xLlGvTIcpHA/cM9RvKglAlA1EqCUCUDUSoJQJRVpS0sssU2ELSdEmpLFhrHqr2apu4KpVSoUk95
+Dh1Tra5qm4cwoeEi6dGdJMIQEOk4R7Ec8pAQcovE5KUFxFJzYSO0WZSdcOvYXSHsFZRTHVVKuQq
gHpZHqR4ptSkJRUK0OgCNripIJvWoWYWYi1TEkzCprUvYUSa+WkmILFHMue10H5C6R2ikS5HOTOa
eFo7Frb0O9LJL4vw+q6BwykZGVcRZxqQvoNJQDaFAMJKg0A2L79Soo1RuLqa2e/nU1rcFU5AXRUB
qUzfMpCrgHkIZwmT6hrkYsaf81ZnVhQUMTKlTpRL6cGZV4AUANqnroZQeiHyKcy6uu5MQKk3iWUU
NahfgBFcAWyeczTnkqBrtUyUd2XskPTJUlFGfl7khNEjlBxn7K9F2xtsVVAZBrEm1VgCucJYk9Qe
xMS4zARBgohQlGfWEnNIWGMEmmVo4jlsSdMvfQLTue7QoNvCA6UF8hSId2dXTRaDoqGSzE2l23us
cpKFzAcuchgh4SIz0ydpvM9fOB2jNDTIvilTNGKTaP0pGkvlpgGONiSfx1IaPdIohlUTIZYafSMH
JIzGK0YNfILoL6VSTpXY0xbVJDAS2mQ+Ek6ZDxmSCiyT0xCs1zQgceiHDjcoX32haroLXWwCsLSJ
cNsb004CqHuzjJdamgT2OrOB3I6sE4IQ40TtVSQklNz7ByOUT74mvvjWkynZ6LEtMlY+hOMXdrEW
3T+iJdK3tclzbdrEye+mkfnHtidkTKSDSNA+G9Jf3DvSesWHQXnum3OJhEseSP1DktytJSbpG+XF
860mtIylB6pPKBvAzhNp1d8nf2oHlUDFXWJLw2mSHCeSTmOy9EyFQs8YsNSOf37EY7onqGpIT8Ub
5GxJ6EmA1w6kcEfrZ60YHQl00jwmkXjSOI4HkPP8P/JJfJLXhUXFFAf/F3JFOFCQDPPNNw==



