# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110125100310-aj6hzuxpknrtqf5a # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 704fd5a97e324cdcb9f4efdf2adde9a969802bf2 # timestamp: 2011-01-25 12:03:18 +0200 # base_revision_id: marko.makela@oracle.com-20110125095450-\ # cme5ynezoivygr8t # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTLhEMIAAYbflEAwWm//93Ov SzC///98BAAIAFADh4rokMjQwyQp6jDVPTAJkmNIA0Bo0GmQGhkHMARgmIBgEwTRkNDAJgjEwyKZ MSn+op5RoyeSaGgAAMQA0ABzAEYJiAYBME0ZDQwCYIxMJJAgBqaaNATJMUep4CR6gDTI09Q0LXFT Z+pr7BnrojeKI+AH2VLapQmW4xeD2uR0CIgX5n5Y3EikRFK3Myumn07ofQ+u3WytJW27FkRMRuGg Nl315iFId+Ckbv1aDuvva30dGOsP5QfEJhNBWGrHl8tsOdBoWYjdxEbMaape3ndITJWp03i80jgD hGAr8QlSqpM5hy1QKH+Ib1aoUOIjeT+XcKwUkHZz+ZPtqLUBUy4sg3UomRp0YgkWx5vc/oN+XBRQ wZoq1gNshAoc9WgppQbYg61gx9W9UZnHfuFi6DgnbIMYOfYWs+srrPKiAuwQcKVX7RhEXgMV6AlY b5kgLnVKZBBcr834B97pBAVdg+0KR3RNYb69N+GYWJh9irquC4ob2E/hEMrwzU653XLG+JXbiGsJ vjoH7dNkrbjKo37KrG3KVu2IaH4mrWGU8iBKpTONOUZGRkeEolRzQtS01FiQqArmD1KRR4oAg6Ky PYLeG6wR3lmtxw4qTcCPVolETmxfDvM+WhQR4+hzgez85mLFne5PyFAQzgpTe1DLbhsYPwPX8YkD rRxgHe4Oxh3aI+nlA+zyEV1lo8PMXuEemicV1Vpf3QIcMvPQHce/vp8TToJO1wB54O6T39wMZ3A2 w9KxXGFwWxeDg7T/YE9m1qnMIduWAjR2EJjatPDGzIkoptZBfpneGEw3EpczJbEokZ7WKGESMlxm PKqjE1FQQAQh0Yy1ZMMkKSYKd59Ge6hpJF9w8ih4J3SWS2Uhl4BpjLLHwMGRLdoM9YpSoHAmWf57 uqbF9DdcChFgvgrTUGRS/qFaoHHMs6/FNHYTTjQuQV1FHxywjMOjkFPHWo88xa8kzhHz1B0irSMw qCpwlvqEMY1z38FMoqqmI6xGS/I/MZ1+wyNTqw1tbToJx+ENVIPRMCGUR0dKzgPxlTr6pXDh0CuR Bky5vSI5XmxHJa0LhUD5HyEdIWKjk9VWY7rLnbnMncxiP0FXlKwWbCyXiqRLwI6WRRneU31kgVSc +18CMxPkmT3Xa3wtLcmNlukGrOxn1EgiMXPr13wbIv7hzWYmbFFWi0qCtPFmJ4+Cg5RX+2W4bsFY MzxlAuPmcFZvHGeYxtHC0DoBd97v4U6P8XckU4UJAy4RDCA=