# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100818110110-zfs0i1vfrccfb4yw # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 290ccb27bbfcdd8ffba9fc9f5e11a5c651d20713 # timestamp: 2010-08-18 14:01:33 +0300 # base_revision_id: vasil.dimov@oracle.com-20100817193934-\ # 1yl7zz2odikxauf8 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYRmypYAAgTflEAwenf//3Mj EEC/7//6BAAIAFAE5kdcB5nLdlt62PYJJCAmTTSbRpkNNJNiaCADIGgBkjQT0RoCJHiIB6gADIAA DQE0qeanqNTQxDQ0BkAAAAAYqZJsVNPNJqDaEZNMh6mnqDRiAAyCSJTTU9MKZk01MRkNGRiA0ABo Bh7CHgMzMzMBL+69DXx9PCBF6bMZZm/lroeX6PbjwpNphfjoT2SMcZoM+EsODPkuV/vko3VUszAe fzFX+Ypdl5RcYOAjnsGBdEg4h3/drPkHgvj89yL+XRLgnqsvKHdTG/imvrZaxzVAok2RfpEWfnCa Dr0THwYlxHQzFiWit2U5Ud4a7DJc273g5g16k8qp4sZnRmNUnpaz14SVLkqlaI/C7+ayUq7Nx1h+ b9YrNOnlA9FKkMosQMfdLbVRNhBVsKllmS0OpeI6RyCHiuTVwTOZBdbkGHtwAIwkna2s0azjBqNJ AeFbneDAEIHRbmxCLLgOgT4PU9kumFmXP7Cp3evM5Uv6vJVpzC2Xlx4blZrJ2Ugzz6HzcDxNaNun VXJEERooRAJHTYygJmjgNvGnxI7g/p5350usl6YCGD4nR4hiLhqUMXIDSKwEnsxbJBdoIcFwYF3B wF04TCpEWFTsd4Atcw43UD+mS8T8kWlsTk8b7hqcIGojnpdYU3BOoyrPI4IMcS5TtQYYQ1SJUDMq 7IxLMdajZTGbWLaSKguIEL4KiDEWDhelJ0qJo59aZGCgQFr3TKsVOTs4iovayzvYaoWdDFIYjR4k 4pJICYEppYqcvOfgNPNrmL+bn9PV0Ybyx/qZLbQpAY+MkI0RXS022P5pWsrcpHHlqftgFuBE/Lr3 IhpgtKdrFJxGYDRUZpeQ18yRJ9pgz3CmINwHdn1UaY4baUTzBsYDVp3KUg8GVy7aFbwvvMhaLnIP rHXDuxVKJuMHT3u7+Ah7hlOugZk9EeVTCy6cAMm2APJywdJ47zCRlGmJIbeQdKgHJ4nnYEkjABC2 9VzxhAtKmYUHBlRp0GyJERNMBWfvOHnhMfVlh19d67HEdnEIAt+6742nCEWt3TlHAndPME1CpbBg KGZg1ZXeJ9kDBMai5vVVNWT3d91NTG0fw5QBSLLa5f5HTfqO2UAbtNFOinJA0+VMEfIaguAgKgRY yVVhnXNxzTsO0wFGuRuuxKD986+Jvcdu0TtonyxZzsGZF0xFf2enKzjg7eGbBLM/iaAKIi4WJo39 OpNHad0RIIangYl5sOYCD6UtCq7ctItUBONKbbswPVAcfE0ZYExWGQDbMEEEkuVY0yYJQlf0TJGI mtskMVQF14VWNo8aJHunT1rBeIGwLvke0Z23UZ2y3xQHThCtQO4wu7OqoAzDqcBjAMxTASbMbshp AnBka1cN4MBZN8FXr9brUlOhu1znnmkZAeFCkep8uOoISCogqbGZORwkvvFVY19iNJVbonCEfHsd 85pc3BVwIFCCYjrmQPOWsZArxJVrPwhmmUQAczFEwtoxpFAUIzcK463z4ynpwMyB2qRgJYLx2uKk gOAIVMj4Dcxal9VRJlMLlwSzgw4CGIo1wkZE1uWlQglLZgLpYpTIxkqNyhxxalt4nvKyZKDmxqk0 lRNgNdVYaS2MMOO4NAgqGxJs7Ke0XncvSrsFoVmEyCudSoL5/E/l/i7kinChIQjNlSw=