# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110120094755-2nlplwul43pbywsy # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 81aa2ac5deaebd1eb4adee8d8f66c337663cb130 # timestamp: 2011-01-20 11:48:05 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110120080821-\ # pf3nm75i1guftugt # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcfJ4s4AAaBflAAwUmP//38j 30C/79/wBAAIAFADmnmHLqDjbahJJU/QJo0j00yKP1PRGU9Rso02p5lJmj1NRkDSKB5qnqeo9NI0 AAAAAAAASSJiGk9FMPUak9EAHqD1Gnoho00AHMJgEwAmEwmmAAATJpoGElJiGpoxGjRMI9TMkAAA AAMJhmDYHM2jLc8bt/fwaRI2Y7cEFcHvaVj3eAtynVmZefir3wsV43E0L4HnxOrLuTcqbv3PeyKq D3mjx2VIj9IHvWJRmY3EGeu6Hvu4eivEaReq0KMwKYw9t9IUVSkFqSLAT8c0TmiwDIM5xGliRpTk hvRfKMKeFARBFEK4iYMUT9+truZVKcU6LHiLXI3rS3bMIgPsehPoWvuK0MVHkW/i+zkurLhgXsss ybgeIzqIjuBvG2cbuaLzdWNXQU1GjBL4t1I3dOQsAu6Bxko7JImc4RSrdYqNpYrHGzMVmtpiraqG uJpUhz8xUrA6bSBAUZ4BvygTV1qKWK1g056NsKwcasZqITIULc4nukk2nOJhoeCeGFdAMQiUprSp BQexM0yiIwBBPJCTgWtJnIQxLQ6UmElCXEEkwEh1BAatgcoYXjrn3owpjfNo3oi8k5NJoFoStbBc TNmY4mpeiWg6dbnR6M+YxrKke0WJkxcbjb698R43Dr8EkOFEG/lKDnd3aTOHPZ3MD5vkDrQyj3vH Bb8tVL++9wPIXPY9ja4Zi3sp08Rwc/KA6dXQGw8Niebe7Qx+Uj4mtSMe/f1PDckZOLUPybpUaoxL PwDfioOAy4lR9pRW+CGMCz2yqRdarlD+1ZtNLmSMSRs6rYrJ+uR66FM7I9T1HJ1qbHpWYih99SF2 xXuPkWFg/X2U0Rs7BCGqj6V0SSOmq9cNLHNi8Fu7ipMteWbRXXmIhQJ0SsykQOJ8irykMp92W5kw 2XAzY68xgPeEA1GMGSwCo0BnrL+C5MjrMSiKNATSDpO+qeOkI9AZ03XVSmVpH1OFQJuMMooBBqSz QSGEc8kwpNIpdohwM1pGIPY4RkWzJaH0NSuU4QIRICzhjALGB+6xcBcQhlNDmTKtV/NkiDFUJecS Nb9g3NIkDAs7lPtpHGWlmU4nDsgaBQrky1qRJbWo9B+7gJLIwUqgUumje4AYm8T7yjS2g0V5okEf 0WEt7m5E6pzX5GuWOeBHosvCYHr9XBlONNLmzSLCagxmSoKQyCeSqhxTeUA9wtYpIT1IcwzM28Wy hD/Euz/i7kinChIY+TxZwA==