# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110420082910-ydw6ayd27l98v0uy
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: 7594fbb1396be80da748fd137e4fee2c2cb383d8
# timestamp: 2011-04-20 11:29:24 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@oracle.com-20110420071054-\
#   832vu7mlacjfz9hm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSOsxGQAAYTflAAwUnP/91sG
AAC////wBAAIAFADfXgAFAGGo0FDyj1HqZBoND0j1A0ANADAAAAAaAAAAADAAAAAaAAAAABqp+mq
aAaYR6T1GIxMQMT1A0MBJIETACZGkwTRpNT9RPJpMMp6ggz/Tt0kuZgbFawlw9AANSGEGaDS5meI
iC6B8w4zzmGhKEfZnv31U9KUkpK31HScBPOiULdWREwI5mGUGZ3wnf91+RHsui+inTcOGH4vxF0a
DXrakTYJHd5asKnTPFxSanyEXMI0UbG5sgk5ykoLB7hRf1aDJleuBJ/mvcVZSy57RdphFS68/0Vv
rEOe5W+jscMtdbR6qY/dEb7dnqndqtMpzIrZeJlqMc9ks0G4Q+/PA0gr9BOfquFWtMYBT1b0RjKb
ChT3jh0n9xUnFtrjJXjib7GxUWJt8XYsT1oHDldJiyNVMxYQzVmmyUzYfGGpbw1vetaPoi9T3tTN
ExqxuzT77bVcKAWv/llV6p2WkVd3JlXQoGZgL4VM0S21Q2KbHK8iKKaeU9TV2ihQmFeyjRlImFqL
HFNA05L5VBTEsYlJ2qDRtRseRcmmaJOE07VL2Nf9ZUYjvJ3Ln9q1ySJilhj9c3xRW9vDpbKxgs9v
SI+U8AvXHgkb5hy850ik6VPDWkfSu22L/jOlFXxQJcxeHgsSc5dDcx392Q5T+AbVNuJvdHf6Z9ug
Mcak1NmtPxUCCscm85uHGrNfdnupekVpEcPNcZGrQw7/UWFkljJOeuboFJdrXZd0TFynJzVPUKUI
GBtHfHJ8S4RKW/EiYwDXZaFIr5aJ1MmWd16RbT3fJDaCtob8Jk2/LL793Jt+o1BJOnWRnw13973k
c16bTjYe/Tx3sVYNL2UZ0eHfgbAnd48lWuOhYVS6poaEcU8w5BRbP+8ro3hzDhuf1+c0a03k2iR8
bAzBQ2hQFDj1EyFWv94zJDFN/1q0hT408kjskbA/J6jO3a1mUudjG8drVJNEi8LYDwa8g83vTttw
nMmXPl3jJHznNe7RCnD6wPdI8QpD6uV2WOtmWDx8JQjh5ZalFMoJnTJLtC+SJ+VJE5RQpwofVGEE
yzd3woWk+QNJaSJIp2jN4FDTWF0rNmonDUsEmeoOVnVWbKrpk1G4Owv4KlXYh7KysVXtFX7i66Z4
5m1i2CfFPoJ/+DP28XckU4UJAjrMRkA=