# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bernhard.ocklin@sun.com-20100309131349-78e4z0060i5058jt # target_branch: file:///Users/bocklin/Programming/mysql-5.1-telco-\ # 7.0/ # testament_sha1: 976fab585178bc94ca66ee10247f1332baf02059 # timestamp: 2010-03-09 14:13:56 +0100 # source_branch: file:///Users/bocklin/Programming/mysql-5.1-telco-\ # 6.3/ # base_revision_id: jonas@mysql.com-20100309122618-bqu4zub69rlky588 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWiHCJcAAcNfgEDQWWf//1IA hAC////wUAQZneAdPezQ9sXhJSJ6pj1MnpTT9U21TzVPFHpHqA0GgAGimUGymT00BPUAyAaAGgAa aU9BBNDKeptT0mQYg0ekbU09QNBtUETQDQaA0aAAAAAEkgIaEYmQmSeBT1QxpPRNA8ilw96hqicn GvEWOSQFHm6BVzIBbKtokEYUBMROL6XtWN+cko72SLQmafU4ZHqyqu+/qHXhwowlNOWqozqf56A+ aD8mB1mU+kCKBcW2S1I03IWZzVkT0siAHGQM6aYwk7HiiaH2DwyCVoUCB1VglFRKF2VXk76GKjyw gGCrEwNkTJrUHAVCEKrarmyse9C/IaluYhOjjHQoIbGHkRQE4xHBkgkS9KjQ8XCpbeKpxSthFdtF squsJB2mPIZbyQpQF9iHcyLozffgrz44tWVGBd66ig9/T/dWzLMTmQWXm0GcSTlRTGWb72JME5EM WziViNHvS0HTnABjDMNhrXyvLalrUh7xvYd8w5qAYCmbj/8nC9lHBtjFMTLbt8xdrTjLO8J2nVYi 0H+RYcPLDGoWgQVHXHsuK1EyovPfNi2s/p+s+BIUVRUJar6nOdY5lM3sRsIGvNSKQrMhaiQuOJaK 5yyK3COt5SsaouUicH2phlCJYEdwjxDyEwI22UAwG7y6AxJTuxHZfI5Q8rIoFwZEa1kx/0og9lEp JzJNP6VxO4w8OhqLxjcfOWMD0LrQyC7ufUrDD92xHzw6sleLqpBzsWQ60O38LI4SLUy3dPB+Snah 8TAeV2dBV/QM5p108USf8clNGrYiELFm4ibWGicWySRrBZhGGALgnNDhQNzIwmyR4x+2A0mF3N5r IHfLmfEhQ7WkAY7Vjuh3Y6fDyCt1oeqcjaNHXLxEPH0ScD+RhQ9yp0aAczuoqOnDaWkDni4zh4mB oDjNpw3aB5G6deeHbmYqtTCkWb7uOzYeQNFKmoNXMXCTSu/IpGwvy7aCeVhIhnByXgL3dV774Tqy AaxZgcoWfbT5McxZ7VjoDgKlGAfhFi8ea6WaMiuraA92Km7leT4qcA5Q11JG770VCsPTg43VR0MN x60/ITrGwSc5MkweYwfimqIQYe8M7jHBErqSewTBifZkNYT1E4lIBEQl5SzNZORiDlfMnaunqosg SlJXtMSQUBrJq63OGb6UXrls4VK0IvS6sLxTrsuZPrmwTX3VieBvxkwPIMMuJy3wfudUNYDnmRvh FxQmA010NXDaipD2qCKTcihRr3qTk76uiX8BxN4M/ffap8DLmQLOlgUE1ihMZK5VnkGLg0pcwyk2 FCq8NoGLTvfvY3JgRKTCIrtPoirY1xQGUJXoGtp5umCYf4u5IpwoSDRDhEuA