# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@sun.com-20091002075918-gsmwes2sikzexjkp # target_branch: file:///export/home/didrik/mysqldev-6.0-codebase/6.0-\ # codebase-bf-gtest/my-6.0-codebase-bugfixing-gtest/ # testament_sha1: 23594558d5ac53e202a4fd2b35addb126f994440 # timestamp: 2009-10-02 09:59:23 +0200 # base_revision_id: tor.didriksen@sun.com-20091001113536-\ # 1tjtar8p2s18lcxo # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYLbYaEAAiJfgEAQUWP//1an Biq////wUATZHgCzDSgAQlEmpiTTaYJ6mmmU9Mp5E0BoGQ0AOaYmABMAEwAAmAAJglNJqaUemptN TJ6gyA0AANDQ9RoDmmJgATABMAAJgACYJJBDQAjE1NEwyTU/TVP1T1PFBkZM1Ksdr7lwhe2LSLbR QyZNUsmS2uKAKUxSTrrUU3TuUGl9lu41xJAkRoGviaSKlWspEpQme2JX35rtIuvFFo8/1fecf9WW PsMqmNTgpxUSCWvNrqrcVFRxbaMiZTQAxjnkRHcqfKlrHpcE4REnwq4BfOGVBORZfdI7PpkAs5WE pokhguS5VAFEShKu5BWyxkOPZCiKKK+Hze6DN1ITIBwXnFUPAYiR8oYjwME7SCAZFan+rj9ScwPH 8kC9EyZTMzzUpQrzCwVgP5OLt/kZx9MiSoCo+yPZOGx1eB2MfIMsJRkuxZBmT27xrnjoiDCAjMYj UxaZDx5SdZEgloMZlZaGIEn40Kce1eyA8H0g4GFWQLs7j7mJHjTZUnjKmqAwYm0Y0yMk4tLVG8nI lQ6+RUHAP+I3m83ygKe/MCsMTgY9kynDSrVGZEexiFRuGGPzgXELykz9B3vkBEoGKBioNpAY4ddl FOgi/CY2kT4Jy0wrNC0YusVJOODwDS6qERzmQBayYxAOJB9B4uJoigaMN4+ZOyrWNz5gjCVjYmKM YZ+swHLoHTN6I3+i3OpjmVSWZhLjEcPq3bZKbk0/FEDNsQkyS98I9mFt39NRJiZ9A7lGB9R8dfwa K6QxemQ4Tsej9rCzHi7TzlLkVlJvQ4/le9oWMNGty5sFQH0rj0pXTx5jWnzHHIYlkcjfMW9fHgg3 HkMaR7s7CJgTh0KMj1dvs6nDpxLD2Cs8zYY1kD0KwgDVAXHQ1Pa9wakjeYCWqpSVGA61g84YwaXR rYngTzalMaNQtpmznPzWE+np3mUnjUSheg/QHDCYWe1XbZp4C0D1AnMsD60MmTmo/HorEFYEUMTX efBrx5id0DIianeOJydcCBsWR7F50JorJaWpt2PGYxMjRFvjHwPpd3osxqtN2EQtomww8zAyF3Ko 2a94H4sEuU45bqElcBolEusXki2b6zenyjRMgzQWh+RmNgeVsxHmWAWB1F2o8kZo6fYDVJH+lgeo PDzZa0LL6dXj45YXCVCkpw49dZjuKMyfwUjntAw51Sc5YiT5G1yiJMG1O5nKYoRNFA4H8vilYcy8 +kgUmEyjy7e/Q3yeuj0lQg5RR60JBSp3LHiBqvALMluXb2/IPnMqQ4krNYkpDe5I/q0oNtd2oOEm HAzkeHHGIFnN5ayfCiboknyVpwNJrQoAmYZdVDBOEAHNOM15Hckt0WVKoAz3oHkg7gP3XAkkXzoH Uo+BJrH2y5OgMoUBQyHrwB6caVnMLZooHVXLciz2M8yBR7hkP+NtzK8cDE6MRSYLsf4gVG/vO3xp Esk3diPX2DqVy06PQePkwHYbIAcgZGzKZzmrIHbOuAFxtyQQT/4u5IpwoSEFtsNC