# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20101021073241-utf04lcju53ss871
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: 979c2ea28edc502ab8be7db1872eee4f0fad5a02
# timestamp: 2010-10-21 10:37:28 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: jimmy.yang@oracle.com-20101021030742-\
#   qe6kmexlvui2ey0i
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdTu4ioAAajflAAQWmf/91ci
BAC////wBAAIAFAD1vAGg6oAhoiTTI0aaZkEGyjIAADQA0QptR6mnoYkA0AABoAAGqaeUI09CBiD
EDRoZpBoZNNMYAAAAAAAAAABJIIaAAQ0mmQNBR6QY1HoRXtnpRTINDggCDTmDCAfFFOo0InpTK2O
QzMqm4Dspd1wkICTMiujzKCOqg4gfPH7uxjrf3GDM8KVxgIMkFzEBU99Mvs/DcW5aYeiHMtiKK+m
/w+uK+4j7L2CZbs/CjmtsBR45vnwWCRvm5JSU+Vj5/aAEWbnfcIeg4JkJ22ooigYMLwT3PeeA9hl
VB3qrVkoloVUOTxwnu7pCLmQWqIwvGWh3Pg58ydO7Dpmy9zH4ltrf9FI7T05TaFRYyeOygtdRlwE
b80EYbqdhXQ3kIzK14Y+7e6MqWxwVcmsuuXeWix1g7tNFrKZWhQYdmmtxOKfUwYmE0k12VDHGbDJ
DTk2hW/emqyrFXjljpZsv9E2mldSf839pEJBphfemNdJ6rLIzHBPLJy6hVI1UsaUSGtHWphTjBPc
rZ9C6621TTlMVTqtyfVXIWFkpxDYClew6scjI62eYmODmpJkFTxPgloWEjfBjUKNLpq2jemvxgTO
TUNEkFEmkoepn57tSp3V/Pv9LVy/ZcErKUzN/dr50Q7oOujayPTp0idKNxAN+i3LiVckv1X69UiP
Y+EA4JcPPPLGb2W1KPilKNLjm3XeszsdgrJ3V9mS9eSGKFwPFeHop/NNWvXhtyFd+6B7OSLUi+fG
kw5Wd5fXpfeqFOOiF3st1iw7ldR2mVNPgtGTa9XAo3BMaYfZUKqpiuVGiCABySGYsz1LrL6q4zVl
E7sUhv9EDSANgvrga9U5MZ78rucTteZyJiQOTlenQO0qURZ+QTXKT6xQA1ggHaqQYzF2c0jQYPCg
mAktlbvNAEpWMU/lWhZApXEs9PwvN2yn497F2wQPyobvIL9Ziuua4++2krRTfPkHjCqdbAaphHYl
87w8VeBt07ArCtyR7Ch1rSHFczZPl+FzTH3x1l+lnd5JH0S+CQ0uOiwuhf0TbVOCaJXFNBoRHMF7
4BCDkPXbJQhdO6cTJky8KujJZCJ7aB+4FQL3hFfKRIKV9HKmxxgUc8nMnkZ8IkbcVNlkHwz0lymr
mRRypKI1kwElbCGMwRiDhyzv5ii90acLHFbjCx9ZIH0nVv3FUEgzaX6svi6DuZez305YLagTkTSw
rKiLBSJnqD1hn6ix+29ea4kgqrsN4v6dwvvVBObwzTk4T3tsmeWcplrDn4PWfxdyRThQkNTu4io=