# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@oracle.com-20101104092038-\
#   rgnwzahii13duj83
# target_branch: file:///export/home/didrik/repo/next-mr-bugfixing/
# testament_sha1: 3467cf34ac360a8bfbd3c2a793fc16dba7385b35
# timestamp: 2010-11-04 10:20:43 +0100
# source_branch: file:///export/home/didrik/repo/trunk-bugfixing/
# base_revision_id: magne.mahre@oracle.com-20101103151729-\
#   nblk67osg74tsvqw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTscBbIAAY3fgEAQWGP//1YG
VAC////0UAPu7z1hzegOlUhqap5TNQ0emjU9NEANMgNGjQAFaow0DQNAExMmmRgIwmjTBkgaRiKf
lGiJ7Ep6mnqDCAwjEENJpNTRo9Q0BoADQA0AGQSSEaDQTE0Gk000I2TUmg9E8pmpSqWQq+UYc5kR
BC5FKADyWuQ8e07eL18M2zERCuo3dD9lAHsCQeEvl06/pnenhkLKQJtWjCpM1Q3L1tsdgLKaAyzG
ubFPkCLY1dZNi7zvdIHxO+ztTk3atKAjElDpcS17smpjKacV2jrVlm4RAE0y8XD0wmSk3HUmZh8V
OI1Tpj2J1GHpIXc+Ajucge/A3cniL1eoTSoAiNchSWQqiBgDPhGwaWDtP1jKA3xcx8nyFeVKI9h0
0IHZMq0LNVCpWNtkYUq9wbds6wVJNQUvXvvgpcE/HKYG0+U7hMuq4mjwsIgvFUyCU4SSDgp+OA8x
t1C6VPR0SOvV/kMWnu9/HEZWvrPlq/cFg314vGLEI4OMFgo6pKzcYWQwyHLrLM3ssaczhS9FkFYa
vqM4nDhFSUiGz9AZ6S6W1vuScscQ6oU4QMjJAZRERtoGc0E9iXl7qKt2Iqwc8IjK7xA0GpMJUUGq
QBCVxEGuRzspZJY1For4xTbmm0znSmCAHnNEs5tYssUjnioCKQy47WNOGhAOhDxFWIiUDgwU4mU6
61umlZ6Vovu+KyDWmnSFnlxUUx5TaRcELDPuqmA1BI0Ci6koTk3PE006siyJJeqRh9VWU4crXlOy
90llqpWBCZXWwMit+qbdglicakHpgLK8yZIvXg75yKs35D9OHfzVmhJ0igH/vyvWnSm+NXDuc+OD
ZfZZz5NT7OtAyyKEy5Z2k+mlBATN/CKAueoWLHWS1DnrWNWe/PY3Q03K4eQLn+TZJuX0h5Cbm5Zp
RvpZwVTILVNeJtKCyXUP+2JPi48BRArWaJjHQLafv8bsJsQ12KobkGw4vzV5R5zi6LeZwTkbQ6aA
UsN7O8ZBIKZ3r4mF3+GfWotEMuL1txuwvJFx7TkblcLxuV7hp3MZCzICKXFHEp7nm5QKl9Lx0HTT
xE9kyiLLlF3rX+tuYKuoOs6+a0v2IYK17rRPXz2TeuuW68OPbVzRvcwRUSjBKa00OdHCFhx8zfnN
hOoCAmvaXkS68RQF0bcwBMurMHpyW3l5zLIclQWN9mDcq9hNZuUQMqFCTyuoGqWGN1zR7i0UkA2O
AhfxudI6rdpsATvZfMibVhAN2zmjavR7aJoBj9XUDsJF9Mie0xGf2kF4RZdlf12fh/hQQF59Xryv
5e63h2Vy4BQuSvVywriJ5EP79VOt6+6vO+zhN9Ba5CanD/i7kinChIHY4C2Q