# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20100624072140-zp22g2u908nifuwi
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: 133dbe1033b256ae8a78603b49654d9cb789026f
# timestamp: 2010-06-24 10:21:58 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@oracle.com-20100624060929-\
#   z7dj4btnkyhqm229
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTZkg14AAaRflAAwU3f//3+n
CwC////wBAAIAFAD/Lz0etzDoAMNCk9CbSGhoDQBoNADQAAAGkUaHpqMaTNEG1AAAAAAAEakwjKA
0ZqAA0NAAAAAAaqfppRkNpNDRmo0AAA0Gg0BoAJJBDQBNDIJglPammjRoNQGTTQ2oISn3W4SJECS
jhiFdbwKk8oALBQKM0MLFNpkiIWo2x3ls2QkwpKT+xWN1RF5pY4RsfEmiaDcfZQ7J1kNJDCCDhye
ZuupnW7ZgHylBIrEEMnyUItMp/CkKgtjAFBBPLuCHVdqktGXT7R2MrBZVuJtq2pHJyR0PYbcbrKP
KAurdgrHPSMfIRxT/XgOZiKoVAh7hdQoe41CqJKaLAwijqsQzOG2w+CWx4gTJgZDFGVQ+OgpCViE
lMlIkvsMKdfM+9NRr8fmpO77L1UynYtMMhF++EwquqvFuEU9mvU87FJPWEA2+pviiUwvyFhez6tr
FcHYP1KEFcUcox4V6sBWIG0MYwrebr6WquIl5W2S+6gsDdwwo0tM9EETAFTklAcNkFisgKKBjiFn
SQJJlxE66T5SjQoSSpCpWFzy1WuHkLi21Rieiaym2tTZK1WUGeFcrJCEBjw9kEA7pQJDkC1kpxIx
aFnnuBJmtaZKwT5yU4DOmoNgNNm+UhwRh8Scs0QRIla5DMKqRDyy6ZGOMfPo8z2cIMdvXjui4mfS
0Gxthhb0qkcZIlMyEOvdvZBtOCmBgEIUHFd2n2WJFp4Hu6nmW5v6efySJHia4QCKRspDZnGvK+SP
wbqkj0IDjNjHy1rxqGXuPF5oucats6h5+0GKVFj4L4VdFz5J6mOZvLvi7B43JyRakW+EYg5xM+/n
aoxUE2k0QXXH5LbcTreaFSEpb+WoblzdBgWF2yzrTlt7bFGNAtnpTKBgDsDo5pSGoVMU8Ztpbmc0
fc43gE8+MzYmWGY2vHdbsnZginbqFjw8O4biQWfArP86ddzHcRE83ipFl1w5rINS61evl9E4vTLl
Obhk0mvpXeyaebcRFrX4IxNZLoGm2RFhqvtsxmpvCfoElyqiwzYLt4QznTdN6R/eYagUyq2BIHOB
mSJdeTOSHBTOwOx4lE9HER6JtXekZh/B9Bnbo6F33xvNtWiMR8S1yJOIwRgDRZcPeKsiQTLgnaGr
qKkPZMqu3ns4pyRg6VkstqFUjwif0kXhYuLk1JqpLJCw4ZOZOIE2UptcZ+ap14hSknvFKbjSQJ6/
e8FJMXwk8mjFCZabaIZzah1iwrfIHWVyWT6SxqUTPLHaWc7zK2pkc2U9FiuqIYqkKggvRHPrV6Rp
nVXtFjXp3+pOqJK7PR+lAph9izB5HMTpCIKLtbHNbVniKd4v+J938XckU4UJA2ZINeA=