# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100511105012-b2t7wvz6mu6bll74 # target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/ # testament_sha1: 24f2e387ce4ad6807b6db1698ec9f6de853a63f4 # timestamp: 2010-05-11 13:50:20 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100511104910-\ # nim8kgguawpis7zo # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe3uEvoAAshfgEAwW3f//1cj n5C/7//wUAV4ey0AL2NDiNJAkpNU/U9SeTFA8mCTMo9QAGgAMTQDmmJkyaMJgmJpgEwCGCMCMAkS JoVPNNJPCanqemU/VD1HlDTQZGhoHqAI9Up6gAAaAAAGgAyAaHqZAkkJoAAJoEp4ynpNQ9J5TyJo Yhp6TS+Sk0xrN9BjPe8+rTu09jcER3WnYXa1JVqE1c9tXP0T2UAKFaucot6CLK18cIsa1LIZBtib M/yFkM/5pa1kqukp0di3q1SsnEUowvy8Vo2YJmpeNY+b+88S+e0hilIq7tRKso6pzCIOSupacoVc 1QMbKliBwRqTh6z1m4Y7N4V16QkNXOn3JDtujwXQ16hQVRiIFoz6XrolvTVYLZAxvSNAEPABxpG6 /EBBVpmWYjjWqBUui1qcFGt8FeudSkykvwmdEhG8eI3mQ/FOdk105ICl2wSOwDFBKdbSpDJG0oAe WmEQnoVfH2gSV6DEzLjIl6ZhNItSOR5+MkiVIsiBWyB5FsWkyqDAYpR71gWQXoe8Tr9ngxhgXEHF SgBkU3HZgSIHptAVeBh5ltBKVjZwLhE8ETydzDN6CNTebiIFF9+1pGrcxWrSLUQCV+YDnWgwFAOJ lEZQo4QC+hxZMOGFjPvKCQkJV6kiNAPWWlrzMyjOBTVc9IxOMtZJqx3nGY1CDgLC0zLAHGRwg8fj jDTUsKTKFS1AyKVtLwYkO4CAFxofbU+4GhaaNM7MztiB8bDFZ5gOMiE4F5kG4MPyA9ivmAw4gam3 eRrvbUshAkHjh54LOciOwAnIKPA3maKEFJOZhY6YGonGKCHIvyaUaWXEZbwhOq0RoJhbn0M3x8iV ku1nWtmV5gsIx8HCc+ka0rDiunxSsgrcSvFuBXkNEUpXPo8UnyJHQR49k+WwfFoMICQs+ihZCGEB vxZtEwvah2z6bYhFHMgugy6gO4oOZ4gv19xj8jgdOgJlWMHDvvsMiVEUVrxBbF/KNVslUmndOB/U EKDHwTeXmBsPEwPd6AdRE8zrA4lw0Q1Avmtes/i60yTHYbhtnb4eCQ4HeBsuAg+AG8DQzAuMjdPR k4kewJydUCsSgutSLVDXQLj2HMkCQGgZbKgP7sAoC1MWNcIoW1YBN2YGjgaCeJSkmA3DfKbSYgU9 DrX2NvA5taoCOUhTMFbzgYW/VCurS+SkPomFUpKYvDv2A9POBdiozoIoa4UtaiAngQXGZpUQFA5G AnAarCFai4yqbJK1WstjcEIJlayrXSrC60sEyuRgv1puIGoyXpkk/aA4qVyYqKknpxNQxgxnIolj RJCDsKp9bMDs0Ficua1QewKA5ynFGpAX2xBclqjJC7PrQFADwVi7VwKwTIpAtAgclynlBu8FMusF Tf+PI+g4GMFrcn76DWqSdOVKXcBj8pg/ZmUXDOOBAFy6sSoJtHeVUIlgGpSBida2vzWImxNO5/CK 7XgnaPN4BPMgfBHqC9qKA63KeY8r6Voqu1jdKBzQxx48QqiqQ+qcrdk0w3xrz3bRUoC9NAZZgW8O YxNSpTqVaFYtM7woTZvVQpLQu+lUiE5jeU0SatVSBlQeTNRNKgF6V1bxWhnVlS8wGutmNh9wuZkr rVYErWJk1gcR5KicLhMQYJHIwArXhQtUB8Kl1FanFXBdpWp/30QROoC3w0UQIodTNm5mwmoSvT+g E2SWkNOosVmf/i7kinChIdvcJfQ=