# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110614054032-ys8b6h6s77wurhuf
# target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.1/
# testament_sha1: edab7f78ff913225e5560dac38dd50012720ee73
# timestamp: 2011-06-14 08:40:51 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: mattias.jonsson@oracle.com-20110613090956-\
#   b3gn23hutmafhb6e
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUO/pVAAAdtflAAQWm//91+j
j6C////wBAAIAFAEXrrAGtFsADiNITFHqn6E1D1PaU09TxQGgAyepkep5RoBzTEyZNGEwTE0wCYB
DBGBGAaTRPJBoSZlDJtJppkBoDCNGCDQc0xMmTRhMExNMAmAQwRgRgGSATIAmAQgZCYmJMmjQNHp
PURtzH28/kMsNBD5YSQY2wYEgojLRVQTP67Bb0I+YnjfbMZmNlxYKYwnJGatF1DFq/Z4Q4W4IxV9
sVLsX3xJOn8bPNEbzdG58N3LE16thHQshmKXGJh1VufgvCauSzuANgCiollInP0Ikz5BJORC8Yio
WP5A8OhM7CKqi0hzOoaVJlFxh5By4lYIwysofJgG5DklU6IlaiDsW9EG1s8F3gtYnjMsMBaexZAc
xcGSehoN4eA0uCxs3SLpzkZrCGdVNSwDz4DVUiD4LYsurRQljbKs0rUDgVeg/ueWMPUvtv8l2O70
Owa8UocF5uv1JUZwC9ycC/BcFiAspMaXPA09E9CGcNNQ9gkoBRNwdYo3vF9hz2AVA5lUmpAlAZIL
E2RibQRS0GIxzNz2xtSDhQkzEErQsOmUCxS747WyMCs72reIAaGN4/HtkxHmqYgUNX14SkbdG36X
bjVRTcVOIHMGNGcwpEJmGwrVwPHmDMXUCqRkLXQQGMKKEoF5WLk1Lmj3hiuNYQY1zltloNOlUaxc
TaU9M5KRqiFNXG0QFDI5+9jSq9MMoW7IRrBtFDEUNKtgc5ZR6PEAHuSw/IaeGIrlqtfTy8uApO8w
KEvnQIZ3E8vbajWtGQFivQStqkNOs7zxv+vSEe6YLR1qLTlHUoi5DgescdU7gRz8aQ4d3qCaGDl5
dhuDgFrBH5X3htcifu8EKeZLB2/30LN13cfLM+JOrWHyFYx5+viQgpOg1eIlgYJGvQ2HiLtcZIgJ
rpINe9ki5DZv8wsMifOZ5Sob0vZSOV7jmFRZSKzNuNst1nWmBonUAIzONlJcUqX2suCk5EANRCEV
yr8wett7LQltDJYnI6VGJFWltImWbjEAQgiH8yhySpWN/dTv36gTAvIV1jgEEinbry6O3noW5iFI
ef75QO2ahz81KmDN0wL6jb1dAKZAVnETp+P0VOC6JsFLQ1ClFffaUbmKTasuPQBKj+cLWOaRLDiw
dJHD2qEO/tPw1wKb7wR7ZAZkjYDUCcCdQJm4+KiCrkjJZY5TOdUCd5uBGmY+w+IRe/cVGpKpzrO0
NFMvgi0e5B7qF54cVkOi8C8BbFi9he0NN4LkKAeHHh1Z/bsKwQm/KcedK2AmcDiUo9y0QH3INAFQ
HSo1i2ram5UVb9VoUYHpHDrdyuz+mBp+M+yVn3UQBqlMuD8YXLBt3WowI2YFLnkiRxiyPS573khD
jNSXHyB9gX3iZu1mSCq0SIVMaImRkNSgmInqYlClpmICtUlCkdiGuEXGMr0mMJATgMPgWIO5UGm6
c4XZA/UeGnqc5GvDvB749YQ/Ow7EdSKXqgO4MScBSAdqio7wYnuxZGHejIX/8LfpqLuSKcKEgh39
KoA=


