# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110328084506-\ # 64iqa40zsmr5ea7m # target_branch: file:///export/home/jl208045/mysql/mysql-5.5-\ # 11882131/ # testament_sha1: e9aa751e0a51e8f71cc7d7e6e99210b313236382 # timestamp: 2011-03-28 10:45:09 +0200 # base_revision_id: alfranio.correia@oracle.com-20110325152811-\ # s1jvs2bl5nxe65r5 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcfMrAEACy1/gFVxJCF/9/// ////+r////9gFSN197nXnO7Hvuffd5Xl97GlE5MPpo7Ge777fHbfN2q2ZFIzW7t20Q9ow1cxstQ2 vZu692AYZEmmkaaniaQZlE21PU09JoniNCaDQNA0GgZDJo0aAShGiZNBNT0JJ+gg0mgDQYQAAADQ MgA09QaAmhNJT0nqfqg09I9RpoD1NGhkNGQADQAAAAEhIQp6Kp/kaEp7TU9J6U/TVN6KHpPEZCDQ BoehBo0AABFIhMJMJtAJoap+gJkU/TUejU1GnqNA9JoGgAA9QBJEJoBNCeU2gE0JT9KeaU3ok00P UBpk00HqNAA0A9SjUGcAB7UJB7nJrP32dbM2KvAuLNa2A8rYEhjFjEzHBk2FEKF6NcTQvSpUJ/dN GIwIriVCno5ft1c/z/c0/M4Z4zpcw/iddFFElFx5E6kDXx+Jl6XROvILOmt3hhtaPAFiuTMSwghQ Bc0LpmxvigDhBxczq47k8YyMHzIRba8ZBy9pdt8mIaWHRU+xVBTEhMYJ+XZqaFQrhssbIzr5it7M aZ0NpSuRKyhhJzhznIJSVcx0tbkoLY0BAiwHAy/M87yxUZu+Xht7K7K0gSvQkZsCHEKlwD8WB9Ur keahGBeqBtwWo5HKvg3+HYyxVVBdn82Nevf7aB6CB0IGkNttjaG220NobQtPyHHqNm+1v7IFrnu7 cd/nOy+F4nGdj7G26nZeeN3vGXcMmPKF4BanNtWXHihmYgWQlqjXQodmUhDXEKzlKtmmyua41xe9 +K1o83q83Z0zLVcVZsMx4dOPSXrJ6PqiOar71nm1cOidyVaQQlM61V70KvL8cmWqLnggtT7dWWCC xro0OqI3KiQ1peFcV3SshqvpMss3RlYmWSVHtpuOeNygLiwnmHbbPnJLDv4axprv7gkYWjEeLNSa 7SO8BtMR1ryVeo8MoqSec1F7WVX6fHbkemCkWnVS2J62WyaFEBEIuhcexdaImr2FaRM8IQkpYwYr dhfgaG9pUYbF7onPNo9jfvIMq1L7ajtMD4sbKtSNLb9b1jBXdtZ3UWkmvbBAYj1WMFE7uLxa5+jP XwmKRm1kKDF3ZeMUr66FhUhteWCBUQgObt8zLDpeO3flkvY8Xiert5OnMvDTiEDhROZ9tVZnJkZL BTKzPf0PPZOlKPJmFLa1S0inxRzgd99QztjbSiUoxYCPgBT6GR7vZ8PsaUu6PZpz8/za8Xv8+zTS VKe5YjHchUWe62Xz1mnqAhIVm+ZDaGNoQM+gYjvDA6j0w9rk0G2nA2MblR9F/Eg9RCmezz+yvvMD L5dPGM7+3314nQ+Pr7WYxvhogt1vuwQtBQISHJfiF9rnavhrwS02jInHGyWVXlbVfDL2CzZQO9ZK V30iz10bKoTTU9WBKTAyz6zhqZFRJFBPr5J4UMPNj5uTuQxjCGJ2CB7QKhjlFPTS2r/N7lIyjovm aODrU1rq4XNgTx6tnrWXbsL+7r7lNBmcZLymBJJacoNe3GctuqU9W0qpw3Ro0bK2qKj423uoZDNh JTlOKYDEQo8z2SUoUcteZOl6enT+b4Og81t9tdyCBswvQQRs87cXOHTpDsi3HSkEqXJMIG0sMSw6 aRXVek2Hz+7D58yXi1AWq1gz2y22tayyAUIAmADiZfYnCu4vlYQqJOCVVAxe1XgVKfQSKx5EZFZE sEiMyBQ9MAEvqCKj4G0HO/7uQZFTEhWZcXngURCPqcdMEAJ3xBncaF162RsZrSSOnRiY7QZQNaJk 480sMI9oYQsqQcBMCWW8z9sb8dapACMci/ZvK7PgnZUVohmMM8729jXQ4bW4Z9VUjUrViXOKsg5v sSHwIidN6NevIpCyYOmXkQx0KMyg98LW1FZKCbXMripGwycpp7lyejM4xzNO52tLY8RoNBeQBOMi mtVU40D/UTWXmRMwPXtQaCBwoOTySFaZ1exd+u4ZIbms4Ua5aiiDQZu8KDt7ZQMZmxWcXEBJ4G7G BzUibKSkl6FiGlSF6pMVMl1NE6qUazDKTOUxyqahKxaGFQ9lVWajOLjKoSHtXY62NCqc2OXO8FQS YkXmPdgtRksThyLD/mRiX+9VisA9KjqVHzrsTnCexEJ3Y4xdjKNM+c+E5mycJEhgFiMWRaUFNETb OIgl3U3SMpzW4xiOWIFct112cqUVsUWJvMxyZG0jRHpaM1Yh20s5Y0YeRMgg1oYFRzCZTqXGJzLk KEaohfVjswJ0HcusC65Vua3bw3bGYZzSOS3B5fVssWxT3aJdDDM3CRFOWGzTi0pUcDaYx5sLGJG8 KFhiDcpOoiDsOWkb4kS4lj2TUYurc26lM56Esi8s4uCdbvMy8lBDgSmQTdneYGpAlMxGKBigpPen 1e8C0SLluV6vHXFeNxbg9WyO2+DcMcC3MSJENeeZYRWkkde645WTsJimQPTs1SKi/6SBtA0epTI0 LrHwLjeSs1mzucpUlSb2OZidVXKdpojdoAUHtYsTQSgGm3zHjA7gFmdQ9XmXMgqIMJ2DhMhjkLxo MExbGswcsS6SvyKx5rGaykkMeDzM9s6YDGdER4FdUqMk5SugkTCk60RGXhVKRIgcYQqdhluKMZSB hDYERwtLiZ2KByKSJ23YjHOSAikUxXy2NYWaD3wNwo898ZuAil6ko1NaHNPZMLM3IMGZuX1wHnpG NpQ5nrNAXRMSk1FOJxVEKjSNlrzrjtG65TM0Gnjo9mGHbO7W6RqNZiRKSVx0UKDVpX1+2QkfWVaZ Muq/G2ofKT4baHOfOmDEWgUbawd46TNcXTniPO12YEi9jmCMhWnC9jn6+FIo6PlclCsoVbl0NSZk Z7B6nqmVtbsYZrfe7sNGesGATNYwLpZ0yLkuqXzKmlJPqcWA9BhiGuGJIcmXFokgEi5LBoDMAlcP Ixva6eJQ0KkScljFpFJeOO500GiuW3zA97NY7P6Z6bHF7UI/L9VN2OqeQgdHVCSrJxIRoTDwQacW mynU8hDCHBzmxEIIBFhFIhQ4msw6IbpMReAU6ni9nVQB+JvZ21VWSnKg5f4NesQ/k9OMdP0YwFx/ mGqop8ndXKIhIghI6ULJMCEJgQ4ffQu7vFFpDAuTbCVlCSM3H2YLqg97/EQofT1msPd+iRAEQhCE Qiv73PpVZs+lIHuPszS/yulU9n6fwnKALj6WLN6KNk7W710ftG0gSSAmuzpUQRu4YHGTHQQkf9CA hSgoijJ445UWZIbbBPBA6TlSb+PVKrRxbiFqGaRfh9ds0w59/IcqiRTmrf+cNhMGntIBc4jOIp9P vl2tz8LnVQyRPjOQXhvgiAY1luY5x0bbmzMQtmfXnNQu+dJjQjngAprcC7o0NdS/tmMIzbaSEReC lVBVFVUVRYTpa7HOsuOkq7mJHEhncKtUzBdMp1q1pWFNYrqmW3aj3ypTLaTNLVgMWksIRCrQofB8 nwa0utgLC+/gf4JCyIimP2dMKC5HrXzjh9dB6KQRA0VAX5UUv0Uoes9J8jSjdIanUlRQhUEKWMCf R5eRQJgSkQ+CfYlamFH2v1TR2n0cz1sP884x+P5jAlRpBDnykC/6Lin3CR9B9RefWdpUcf1FypcH c5D6z8G0wFIy3aSJRAmQ4j5vLCYj7LaTFHLuADWpHN9cyrPtP0HzLcVlwdQi4Hi29Vj+poi7M6rp ladlruZISa3ZiL4ssiUolEn45WTlQiBUg8mIhNrB8LHdd9b0d82LLx3FnYOhHnEyXugl52JHz32s LBnpLr/Ohz2xQS5Fk3sq3y3rxUV9yk49RN/MVkTeHM8wxIgByHO2uovWx6CzvJNJI7DU4y5mVGF5 nKlBgkGMtO9k0N71Fry5xOpCEd70vanyYj0whXibrX9LIpO9gPejf3KfiJC7X3CcXZrgIN5vOBtN 05uOHEdeKibjxLDiy5Ghy40HqMQdmTJmJ6SJtATFqvICcF6SQ4/RF/X3xWMqEaBatCTgrzsLMmNe o5sVTNkXTkoSACo5jkb1A5bA3fs/3dU0tMZellYexYopAWcn8Foiss4B9NAMyk0PsQOqUgjGOLxa iUBUm91oVTuV5oIWNwNeuuvlR3Tc7FI6HZ6l1CNaS4rAvliUt4EHAwYQkTK7FCwqNEKlGQqN6eZf tzsjjJ7U1YoVIgFpgAkwhHxzUv58Y7DiEkNsUmd6nPlczjqam9vjLVMy7h6wtadPNXza2R4N97YA w/tT6ly+dhoGYYdDYOnoy7HDHD3dbavm6uIyx5qEbU+LbG72pqKJyUAEbTTMkZHkdg3TaaSfRu0a 1dYcRqy/X3XfFPM8ZXE7TcXOMpHmUMFdsL9fe18HB0DbfmQdKDq59zDmaJtEMYMPLmbVMuvUKWvM 5H1+rPzUN3jyGmynIKY24L2tDsZrZg1ZBkkHW4iNnZBb+hN5Iz8+0adiS3k9wFu7wxTqjK8V2lYc MNDbP9vISPu3YiqbLEmTggXo13rfOzPAmTWyUp3HKkSOt4FKecDxhxwpBunI6kA3uV2UhJ5qqSVD 8l4rJX4UluGer3qAKK5911LyhAWLqOQLERymIHpRQJUQTXpwmAUsAtg0pfQoaUq+nCJ6mOCjyncd AQd5y8GQeg4ZEig9R06ZnTQi8xFRR3qs2HoNGF5ceI69KuWJiIj3q4kaRFcVzAefuQafJAyDqESG ZfCu+5ByVq9JNEy9yronIbVSpTCLJIYYzPBnNcGRtdLQA0tUKEpCMdtQFGjJifADS6OlOeJeBOBi YERyN7TQ9wJ5ezPXT7pAT8290tCnvhTZW4z4UBqDsk4CCIO6AwZKnd4c83gimBHSxz8eXd++TvXi Q82xn8h4hqhXN7esFsTPOCSer6p4GDs0FFkjGCJTv6hoMomBIE5jQbKnZJQ3IiGIO/gC/C6KtPXm Vsi2yuA+oUmzk0iEkqr7FfiF3eoLncOXDbjMRkAKC4RlBIl0Bb0bpjIsKRCxUCOaAWAcIFoobhou THivEYnWTbD9MplID9CDIa8OI74eG0dy8d3WOSnlq4qheE4IQgLr7Ismk5TeJ4KToFhJRq27ALsp jP4amph4AyTcY3Xa+lk8ryNWUYcciRAlCHjE4EkFTaDnabqXwwAneY0+QIW4Rh57bHhTi8WodOUr WEIFiNYAQmCajJxikEpGdLG5/d3NDmKe4rGXpguxZXpQbbK8CfITFlJ/FaixZb11LDQ1rr0egsqI QEZQEBQSQ0UIfQVU0iVJx6o0J63wdFyGGusSihrCQGSHSBar028cCia4NUImqbgLOQkbSg/8W0TK mI86Q9tSyHYVh2KdlR8cU8OJcJjz80QLIt9sYjLjQeA0rMl87IdAogTFEqjzylGxpAqQZ7mjbTS2 OgwExreEYEgPeB6HS8QHc2WTwyJp1sE3IZWJQpAEBECluPA62lranmw6NrHz1zeMg4RTFBa4MbnA 1hxjnfo2QHDI9DYIfLwQLHnfgrjakBxTaliwJ9L77IEI+1kULQkGh6OJeiRT1+fyYmzfXaAHSCpf DfIPQ2lCCGhikc5qNF6oF7wc8jd925bv65oOG1f+8KBRMpbUg5cdafsZB07kiU5MbjO6aiT4yF8n gihvO94IN6W4nSd83dCEKciyJIfabRtErtuzesDsfJeJ5LYnReIsChPZhggtC+YFAsIQvEe5lt9T 2uwDw3OsU9rU9B4ug5XagmgDe3607Japeyc0aFL4FggDXBKEWcPXA+BrFI4mGaFUIQCmAdNgHstR 63r2NbXCqEEWbpUs4aWzWUMcTVWJKFKRLo0w4FjuSD3wu+E0xgonO0n1wdoI6lptELYKcGkUt4HI hQfUA7kc8SmGs53BE2KxWKu0VyGQsokBgCDEGuA+srUuvHh0uMzu0Tkpq7LQeGESaMYJT7sh+/Fa QtwT4e6nMlJZzSwhxZCblGDGYkINVJ7gdmQ+CHQoejIQ1I6N4at4a2SigloQYoff9JpBdc0GG5Oj FIy+ISLF1WtkF1IBHyQd7aXd3kkkkkkkkkkrkA3BQFqV5FJFJFLZimZDLLCaaJqE2EthbQb5LhT5 qKtzXn13Wz5EGIzjLpYeCK2OqtBYhRuWE5RnUQoSVwilzk2KGEs+nK9/Q9jjm9+K5w4ULkwsomLN TIJWEDei5EnnM/mqE4hjMgvlNNAa43wAyUXVgBggwvKGZ4E49/XPK4yeWU/cHs61BBNotiCkHBDN HmxlASi5hYD8gFW/xd+a+voOVx00rzG/RVhLFKgaGmPsShrmpwcF9GVWrYzobAOJ8XbufJ8nvGxO Ks/Lx0PmYn5bUHjINrp2jVYuiEgSPI3umrL0pVxxnVutPdZVH9shuwYflAsH8PI+w8GpyvPxDDi5 IgtaigA8gqkDa7yve1POaHybb2TdWwWwH23eyO2CuEudksLBY0NI6Xe5VMub0yxN7Tsbm3EzdTU2 vPDWoZHVoaL4jLKdFEkiVT2vQep9DQV9CQ3ttMOXNxNKPO8bqrbvMUvoaHA6Xd1PIh8YU/4u5Ipw oSGPmVgC