# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110323095224-\ # z84ht93cb8eb84f4 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-trunk/ # testament_sha1: 389d8841f5e2931c81131104780e118abdbe80b0 # timestamp: 2011-03-23 10:52:30 +0100 # source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.5/ # base_revision_id: magne.mahre@oracle.com-20110322153114-\ # y6p1m9y730lssgf7 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdGpT28ACh//gHVwABB5//// f///6v////9gFOn3vIR57T0zj29vXoa7R6NNt7GSpR3mkvZViZkO3KjsaaG2m1qlrY2Vcme7cB72 CSQhMEaaMk9JgTEyCZBpMnqaNPUaHqaZDQABoGRNABEymRk0U2U2oNPU0AAAAAyABo0A00BGpNAl M1N6hNBtQAaMQaaAAAAAGQEiITRDKaBMVPxM0U9TT1JtJ6nptU8KAbU9QaNBoHqNGnqHMmmhkADE ZBkANMEDEA0aaADIGgASRBAAmQTInpPVT9U/IxT0U/KT1GCbU9J6g0AGIBtRHKl9Iwu9kHIMgUFO 7wZzUZ0aPfy8kupZWvEhsv83+9du5X61GBE4F3HROtynyrojnLXKWbhQJWI8Wswn6baCvj/nwPeN BnFNO10H4Tl47HQA077O4IsrJNnX89zsWz8XhcH6Ptpf4dGcNrdP9NcsOPnq03b9e1m2tkBueyBX 1ul2NEvcOfdAeS+7x+fsi2emu9HTppJ0tKzDF3ZsaTbaRRhyApQMUQZ51RB0ZlJjFjxbm9r7Y6eY zSkVFSz2FBxIUPVZGt1N2pOSxfj2aWcdff1rnqZ04eJ1JQAo+zVX368Xx9tM8kgFoALW1CaPlYpl QDbbaGNjArY5XD+2vdpWWd9dNd+C8rPT7uH1VY7mVtmgd1PupwJ90QfQJn4BdYmIbBsG0hsGwTYg 4sz3pIOo3dsR103seG5FcHG5qIjGOyTtd2WUSezsVwRsiGQypYgqLh3cWqsWKk4UKakZDYjNYxLs qZdrmHIRYsXWMLSKVKCTRWRQh3Ks7OQVXLqLMrLYIWprEK8sLIwbVZMGiaWNw+Z16V0GJc92Zq37 dRi+w29ai7jjUpsveiOTTwv5vD2leg3+liP+rapIPHNjnfbXvHScPHbWb8EHhTgKZb5NFB1u8nz/ T2/00p0Ex5yc+2Lsk6F42D1V8/XeldzeGB1ZhOSpv3uR2MS+kvyEJ/XacZ3ru2fjGzKTou3h3p3R cxkPhpZ9M+ouBfOwrAdKh/NvXEg8JOaTSumbLyZUNKTzdbZZX7kw+SJ2OWrK+U4OQLvyWL82acFp TonUjetVfllju8R1Z18LcGau4rwY4t0Rekw6bSrOWniLdpUKsobfbixqrkjnQZu62G1Fq4Eit0kK 1eXMBO2AcoDne+LC60gkIqaylTno+Osd9BNK0POfl1fmTkuxRXoLDKxSNYa4gd4AvmLkm1VZ1lHD tpiJFcdgCXb2VZuetYh31nQVVbFEjLzuYF6wKWCzqHUqvB71eXUiV3eNU5H6yx2WzPHVMz6bzB9p SU3BFyfSjwePyu63vlu7D03LisbzMMNPX2Co8zOds236xFcbsT3JC0vODECPhuNGJvPV5Hwt0OYn Qu1g1B63eIPvsqIEqU7H8k4RepjM+XC6ulwtQiHAmtvPMP2vi/L4cVq7u3Ut56N5qCwO+EiOXa87 fge4FYi8YBz/Ie4NXTwnr+gifYD83OPhKDbVt4WMQTsOHxeXk/zDS8YeVh7vYuS+MYpRSvyumAW0 jYtqDvNo2HRB2J2CJQbAKUr5uZZ9eS9IF9sC4dQwBPqOhwfVYkCnk8U9tLNwvTGuqEea0O0O8deS 2nhmgNetpjhoF0bIBGOnptRPvCID1JxOK8gbz92cG3gyNjH2MlkYvYsNN18WmBGo0a0cRq68ZQAd bSIbYiGWas1DJbYYdcCTcslpF+O25HHCMT/pdXoYM1JNEJ/jy6JoLFJhCTATRzmdKZRFbqGRDSbE jpO+dpZbenCUyawLqLFMqeX6d4nNZWJpR0vczs3WADaTCTJLoIWgQdowJYGy0LDgdOBwfjjd1bPY ggPQ0TCqEqpDpGEVijb2uLxjj1WaNtOHkRrGM1g2kcWcylAkWUkRPTGHrdzE07zdKTVpI1VRsi4G I6knU4Hm8DoohRK9++4tYQMilkYBA5Ci5Naybt9G3pyVNWTqTXBaXQVYEKCJzurUxEJstmMsLB1s NhQPIxII8GmXMniPOyKBmN/R8cTOpTNhFxucdRbCzk2EqDc1yVi2kFtFWYmsU9ONCuMuigRcWOpK 3XgMlKIQ63uXbij0jMcMMcU1VfN1UEQ6SCiIjMWxZ+bUeyyM1iDPen4tzHCZXQriZSANbOSAcIxW ilmwBCWo3J74hcaWc04JiBJ7qpEK804MxNvMc9cUFMyK3F5kf9Vpe20rY16loYrK+MC5tIvq9r5o G04YA4iooABUmxeFZJmMkkGDSPNzOcyQMbjB77EXF45EvTibqTx6JJ5kW12xp24bpXU1c0KjEmpj GsAxLDMuHNea+/gtFzWqhXZVnmrMJPDHfw6SWs8em2Kh2D2EJsQkAAZcJQVLBEAciEUUzq8PFRex oGCoBNDEKJDazOu8JEvoLLoMPr14kiqmg2W7ocDeOYNmMyw47FrSxLBjW5BYyucAyj11J4BHmJSr R8qpLa3XUV3FEihXefCNnWM3NLdI7Gk4UM5wiJy4mYAFdwURkUrcbTQOSgw8V1Q0NBcLIoKvEEeG iA5RluVrB7iVMUtZh2FhtoGoLPExgTCjlNDxHoD2jg9JrsSo1vC78kRHNubSPIdThOsK5D7hluIj HntLXiNpXVUTnUp0nGJaS6euzImNRS9hTXzXcIOyTVNMgqSkzKdC2ZSRzXeMDoMXULSNJwFo0iqN o5TNLhiYB1CgpUJM6JK1B5ZpgzERGdxsN9cwtkHEVXYNmbl4CspjDg+QRSLiEIjGYyesYcYmatUw m+O+8qmBqfcOHUdT1ncQ2zLM6OVGdnnoias2IBbCmYeKonKpigEUiQr6rSSheOUM4B8ABwk1EibN Cwztcv3jTuqZ/OSJg5TXZZtsLDHhtMhBEvNGQ1DNryGGjattGXBL2KvWK12tQawsIoldRcX0UXFR BOwABBhUYlcY9FhTcgJkHHxGTgOWUyk5OCVZrMoRmFV8DrRW8FIclIls9FtciNhWMUjWGox6sOXs XGHt22Y7nWvp+l/ze93d+BtzNVW9iNkoxGwCVOyHEixSPBUdUDIjtMYdBGKAEALBVEgdWq3oAoyS 2e/7bRk0uiZk9W6Ap2eVLb0ptnuI5eb6eONQQxhWPAUQDEN0D2hq8BdxuYJWv5X5sgR8u4XvP0f4 PYfANx9x/mQl+FcDh+wvCAmBmZylKJ3t3AOl3/ZEMcCoKUVf83maHYZUy4N9mkJQCzPtSnKaOgUM i8n+iDM1xtII6NX/EqV/bZNqz+DI92k4hiBzb4G2WO+YOfXEvsHD+IH2GtNzaJXbTFU6ORJkROJT u+EnyHYa+V6gjnvPh94WnAFvtXHLI2mT0gWWjbHvniGcvIYHOsgRgGAK4lBvmKWgXIBWhYXXgYeQ C0miBYnyzmSUMg5V0dqXvAmV5ctDA21J6mTkbqKz3H0GwJDfdQL8N/GsSkT489RENwKkGJjHajxP q7js+sig8YIi4nR3ioU0RhBA61u71IyIhIJdvS+dKZgPWp1l8d6mhSCqYU6EWiVeKCR/s/gXgvzz 9p7YYiVjnu95cayIe8956j6uKcXfiQrRlYxahj5bEudmDp0YeJAqO6K0yKUf1A/0rTRLJBTNdKBr abQg4eH+D0azKHobcDmNiMUQQLBYzZjMEzXJ9DNfAKiEwdc6/VswO76+RJWGIZkD+x4ZGKA9uQcN 0YPtU7lXUE76MZB9mpU1ECryyFaFuGNu4ed5hOU1oiTwoPqWMygEpUAekpIkewwcxYazjSMB7TqW 3XQkXHD1ehKtWBTSu8iHctD0IQEk52gyNRq6DM7jvM58TcdRIgPvu9OQLzWgGB2pMUj/IrxLb1DE /QyfvdC2Kg9aHrBq7SORDUCFNa6hCfNuP9klaxH8jluZMFRNRX4H1nFVVaLRCO5jaRLkTSMID4MD sQYHYDMTG87jp6d5icLYEz4iBuvOJdEvA1qRgsmMAO+cMhkUoUHRQmBLkepTNEdN1BUaiHN5tZcT vJdf73KBFbAddKF5cckqI0ZvlH0/8t2X9/oW4rCpL0mnhdJ3aGCgE1tVMWx5eR62dvVx5PwafK5P xGfVtmsrkIqWZVYojt4kRgioC4qOw3RFSuTP3Y/Or8kS3t2V0itWmXqk6IhAmmgMEML8FdDabeI5 1yeGPeVHGn6Xz4OgwxrWXDi4wjRWizilVyAvqljMw4yCJwTI6JFmbXNzgGnBwUcozhoIZ6jNeKji CbQpTfD46UpDNGhqC+4jCoRpkRFA5aGAVYBFIbot8KElHNqLM7YiTiUhRrKVZ5zVHLyj5VOeerpb 80V6ULMY8p8TYVNR8fNfA6OUfS+C2ramxiYXwnFUgCuzapD2MbS0zxZZEnU3E5QY0iawTabKiTzP jWylr2hHonewMycinl1YTQskZ1JWoISBF6MrCIQIhJUcoJFlqFAOsyyIT/zxaCimzZQJm9bOGew9 w9bREWbMcEnLUkufndz7CUyqQo3ExmGLD3LkdJvJ3FJ0HUqEsbDWs1TJaG5TlTl7xa8BzHF0iYHp QGKnIKhbCAeloqMtt6bzQT8IWzEQc3csuIZQ1DENUTSHJOJX3+ChaSqSNTTLPXBBeNK5uDHlTONa Y2m8gVCVZOGMxWO9EiHBMHeyTMkXm8PgHB2RDk9NNkHWt4gcMGwJnrWxdIBkkCmu343ONC8lBPbE xxtxtT51MP5fEpNW42pG1lCS0DcZmSVZVzQ8lBejzefmcBc0oGCdPuWCU4/JSCTs5fZj2MShuYMj JWJKrUgf4t7ctwmhHdPpyNkodpiitztI8e+PHSBQd3ZgZ0seK/IjM1dfXO6rCIwMJkmG6lsW7ZUw s/uY1YK000+hkDTawRRB1TzHngW8A+w593u3iLHBwgUistIFrYrKFCU3ZvarA9aq861+KA5F7HR8 8B24tuI9M9i6qcKuEGRl2KuzamQEav0+A0Y0ES4dijYttW9mtLn7IOOkM5wA5KQcvxdG1aIKtSoX CsDpQXVX6LYU1Fczhw/bULrgOwyNaBWoBwCCK8WCZPMjUSMqVDjqVM861VxjPJkSg0fGsNalQ4y8 SoJBmChhd0FMhFqjcorVhN0W/Ui2BYcCSXpTpzLat/EJg7C2Yp8q3uFNh2XRzWBjmDJZrirDyVF9 wVpVIgrZLsPO5N3DubU2Ug50daz4HsbXxaRRsimkxLo6P2TROWNshOBNRZAY0USQnZTQP4xRcBSU caKIKKHggdx0Jhwd/iVS+axF3wMi2mQIySB6aoxpAjLBEIm/jR2WWyhS0Eq6nDHH5Bo+atAbUsTG EZNEJmTDIN46o1rhyC+bswm9AOBWqcqOKo4hFMi4mRO4wg2IREfflQHSAySq3VAo/EeNJhZ/G7sY TCFqY1owZMx9bZshSZX/NNGGNQSYwXcC1m9xrbEGXINp8rj52ETh8EChBIHbaA4E8DMPqy6HxKHo rMhYwkkxSs7ofXKPpzxkdcsXQxvEmwqZ0acMXHtcu9L+SSYA7ViWcOfhTuYTAMtOlanNAPcqEqF5 rpdGX4F25iVF46C9NMnHThUizKBgYcQXpVeCwA+Rqq+SQfL2nXTyVis9xos0gzWopSZG/tD4THFV LbwEMbGJtPZAS2+ykNDTGvBWUE9CjrfsfrXoUWxSXO+aRAdupC5bZ1EF223L0d9u1Ur02lFKYGCs z2w1zd5j3JRYCKR6mQbEHragueuN1oS6lkt9ZEb3F1TxPB4A+pUJlEHGs6RrNBWQ1ehyQYNyBVg1 qe3WHDVJRYSSlCDAGEbUFgtAI4x5GqcadMgoXhRzREB+hnMAq84KMcRyhURimk0ejvuMbpUai9AF Iy5Lx6gXTIkOiopRipFVUmbFoA0X6NNo6+l1AtMreEUnTh1spiiaSt7Y5IMKEteSAuWbIzVpqK4N cwdLC7F6yXKNoxQtkcQ20/NKQT8wu94RDcRErl8S6As0VkhUSDRce18PJJXraG3SsREqGJ0I69e+ 5AWKiw2xAIT1oP2UtfpSrOUDByZWxe4Dcx3F9WxF1eiqhGlnJgQiwGOSZDQh9EYo5IwpICBsaqUa KMLwW1lsTETuGGNi96VUpfIqHpAJVVWBBKsrqC8CoE5gt4y9+ZzwT8Byw3RpIBbaWXBemEGCYBQn pLogLzLeqV1K4E9tIQSQ6qexoMgtBvWpzoVlA1sqi/gbCW+e8qeEJQIgUgOo01Fwg4WRQRVaQZwg e/fSxpdZQ6ejO8iQAa+MbXrZu9eqgktXgvpLg5kmsR3LxQcl1J0IoNXA8M6wR4LwHHirVuVBJUKm EMflYIo9u1FDFnEESKkgtuX0LgcCQMuYaCd4M/zreokHlDkEDTohuYTlcXpGCGyscnpkfOMjSurq 3cdSxM9R6zrkiHhw2HUsQHoEYLVipV3EOSAUkv7hnHRpNBjpbk++UVGbTnGTu1K+pYeR2rnXTYv0 XaAuxXFoBH3bAXIyzW86V3nhy9nFxfayeLhFj/4u5IpwoSGjUp7e