# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100512104603-vfwkgy2fgjqtohiv # target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/ # testament_sha1: 177b92a4452cd02155d036e325d55a108b76ca4a # timestamp: 2010-05-12 13:46:11 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100512104212-\ # e2h9n1obxjb8tfg4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWenYaU8AAZzfgEAwW3P//18m BAC////wUAPh5ou1aHpdtm8NBTQ01PSnpHk9E1NPUNqDTRoDTNJhASking00NKeNKeUep6gHlD0g AaDCCUJoTRR5Ieo9ENNBoA9QAAAGSSD0g9R6jQNPUaNAAAGmgAJKBNDQhpqejSYptqHpT1NMmBGg 000nUUHTXy1/smS6U9vxyGVjCQGSHdBqxABsac2aKh3XJUPZxmYw+xxijvQOZEiv1wMVaJlc3Yta 4UDPsxLGZ8E2ngYWNA96B+PTA8tgx1rdgcvqRIlSghoDfDeOI4bvFgn04rBQIf0oIWh3kJJhnKEL FS8E+dKertIheRC2oUsu7JPpEpVUC880Mz22se8Fj2zzQBchwfQU5Og8WiIkWDTVCsjrHj9PEzm0 7KyVpmYto/ygOYkaEF0pZ56YgXGjBCRWdVvG+aFQ4em9xtdfA5SpCwfMlFxgjZxi06ubuYkPEc6p j4nphYSibChxaNC/zDQYG4tOAnKLpG4qE5tZUDRjSBadVU5QMWYaMGikVlxEmPey0bPNRtsKTomE YtIajitNURsxcpGh5nHjmvscIuvF4jGzPlpCVJCb1NaRZyHxQkEMSxaSyxNGRY2UYeb0GOfeSqQp KBOZdaQNUuSkKlickq0YXqGkkExyYy7EewXowqw67pxxlBr8mBuyOv7OmaSVoXmlEPZ7VRT30HwV No2JXncpGgLNXhai3qDXb9EDSOCYuDoMkjwjhgkbTIoXEaWEA8Eh/fp4R1DI0gpRMJxPRgJCx5Mu TIv0uTclJIOMCjqatYxMQrKTIv+Y3ObyaYccfifb2NNDmJDIJHOWcr4yM7hpQPT0xpQLeZih5UMp LichuWIlhMTpr+iRPjvO8ttMXBWMCczkv98jZmJsT1BWN9ExDKys3aHadQZjAtkoSAiFT7pHFcTh sI74F5caxpgaCxOF1ifFRLLlHFCDfijQIjDUCwEARQMySuCsQNhwUa5U4M2X9B8TppteUi5lNvLd fwJ5vNd4ReZy4KdfvzuhzAUloHpw6RWeDI5eyyFrPbFIsxrFrDUCh0/qtKJGp1IkIXCfRm5Hg2Rb 2AkbCRWj3IMoUUZWKwyZFE3bJUMnlKKriiiZjsqCIKOzIaf2HMb+2hBUFRuIJz8O5err/gJdgtoK oDlMj+pEAsXk1WxOnZeOc4tmhYFC8uV98Jnl405AYL7iWEmM29LZwLN7aqF6hOcwStMHcIjqLFRk iKtpuYPJioygLNOO+ZNZoNTM+OHBIi5rTaJY6N6JbAyaBjESgViOqSY7fU9b8eeicVlKfrE7u77w OrPoqFyqXQohtZcambBNajrE6bZgi+4a//F3JFOFCQ6dhpTw