# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101015134939-\ # gyyr3z1p31p8m25j # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 5bad6e6bafc94dce2ca22d196bab12c48a8f9d03 # timestamp: 2010-10-15 15:49:43 +0200 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0-spj/ # base_revision_id: jan.wedvik@sun.com-20101012130044-6q5fl5zskspdb2jp # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWemiUXcACBR/gGwwJAB4//// f/ffob////BgEH233OqWvWduzcDFIthkaFYWttW7dO20o0GiqpUqpSVDbChqp6Rp6gPUaANAAMho MjQGmgAABgShEaMmgIxVP2SjSaaPUeKGg0AGjNQyBoeUGimnoKj9TSMCbQQNNMmTIZDBAyaDEGRo EiIjQmpknkZE9NTNCRpqep4o8jKe1Iemp6mQ9RoGg5hNAaA0aMI0GI0xMmJoMI0DIBkwEkQQTAEA mJommI0yUn+qabUgDymNAmm0mmsi55Mf3/j7vP+wfgEQ3vD8zrKAVD5H8ju42Fxi3bE7isoP3Ina fMUChWMcU7E62aah0/Bc+lvjpgrAsYpAUsB7T8dh6nSxJ6mQIgQyrIuuqon3zn954ceDA8D4Qom2 Xxw/o1fKPtDx+lb5Wek6WuHNN9WqexoaUVrYOo5t5+DNac+xI52XG32TAU0vy+PCBt3WwKQgnCEL P0cZrpIQN5PomHxVfb0FtR3d7JqYULy+5lsCWYu92iLxphh0VlQ8Q184cvNrvp00VFTVA4DmCgWo SUQQxtoghaQ2htCoUGh+YPcBvA+45tXDrWswAVRVBVAnNSAz8TrkDgyiJuCOMyZHtR9EVQ20NobA Y6f4SODpp36pnRvOih2PpZi9j7MqaFsHUL4qd11KPObjuvir/cNHcw0aLPNt7pbOlFuYE3U0am2w bIChj7HBqAe1p2cz5wPeCNYDEQUUasA4+mZHnTwCo5Bh/7YBvoWHk+KqLLPGJeZ5n6056NSqOh7P K/iAuR8RO+lq5wc62pnQnXpVtHEaLfPhDpsUFEE9HXFvNrdxe60gwzRmyALPXUcp7WuevDSh2MH1 ibiWCXxtVlWsvwhYFwl3TpZKmJvXQ6UJnyRElfJzWw7TM3KdTyKbLXIPqRPXC+dItJ/W+ndvGs7K rMmuF4XaUuvWl/35SyykcT6hEIECI4/REg7aEBTsFaxYqHxF4BcUJExisLWMZ1H0CoBQkDAwMDAw TBwcy/ymYhHbCSs62nQSDfZTQIpbApSqp7DjYjWRpC7ibwBCilE6q90cM0AW8fX6/RLPf9WkOn9N T9cfX8EYH/Xo7EFGkjgvMNNIGMYmFvR06d3n8s7Rbht4NtA2m0NgU8kecYnnKD7BSD2UiLZIY3UY 2zDkJm6Hp+R/0KzQHBSQDedCZ95aXfb8JMz+OKw+58hAyQZLRlkMJG4WazMx1IgODGREuDIyMyRA gYlprXH9TN8DxD1YGQi/1Ll915f9P9HGvEvY3cdTFARD2mUnnTwr4VSsLNx2njg+rSp9s8JSp424 2vakdiGRrBxTE4rRBbcnLEyZAE5AwEwYGChBJS1jjtSy7ewRmQ1zRBW3YPcywe64URahHJkmg5Jg CksP1jO099K0RAmldrrQbFIwkWCaIqOOloRCSJGmNJVKmWVxQszgWKjCRpq5ssW2lNLoXwvayklx UpJEajCg0SBcqpoD/S7g5MqNKCinDjwn/2d4uhslB0ilrGqdzSdQQg1QcshpyJ5ppuFSAe4M/Fu0 XCYNDGMa3i2+zkkTGKwWbEL4MS2njMV2kW9e0vXOFjaGWvXGhgoK9UCCYGLWcxbjhhUo1xEn/LFI Y80m0xHT5f3H7caaJ31g+AleSTkLbIEyRmVG6gKMMBvDeSOhhKw/IpRM37SBojV5HGApEon/4lqE rTn008W1nGoVKXwhVGeO+DrGdYNIs2NMWHYkIqghLbezQmqcX3Ct5h2JCgY8RAOoRFLfCRKiLKO+ AGRxJ/pIF52lhwORm6vNngQM91Znrq0JBCLMNVwFecChxUAUaLu+E95mbNZfTO/oJRoJywpLauG7 oYkRLWVWXXmontclAWwYTsNvpUWMCqsSgGBrKJUj2EjUQPgZFJh0PEvMTmJdpSxClV2ExnnF4fp1 C6gwVAwEwtYx2CyesaloNq5GFCsQLGJGay3Pi8NRtL1inzlpMO/cFyyHmXRAIGAuhMsKIlRT6Yfb uIEpY2W1s0oG02lAcKZZ+IVT0kEmSXfkDlhEennScyarhWaVGFAxpTWutJ9+Gqw2jyI3lZWSGNqp MRLcczccjyImK1HToRutddSt25uDXmaa16E5lL9YQSV5oeCFRAfyhiLlcleEQOhoXGs5eFuorO8w 7Vn6HI+h3nXLbzbmcwvLMA4VVPp7RlvJGXZGJIrIJ24Dk4BJ7zjtSpKyJxKbzM8iFA1lGp2hU0sz MIlFxNTCNHQaL4udKVSQJrYVTZYER4lpDmNZYS1T0M6tK4QOfOZ4kTmZiJtLK3By38NDQgIjjgtP QpqoRyMoPoqODywRQMS9wvNZI6FxUXjVazj8T4LOvEKGZuLHG9pQWrxUFDCZSd7qKwF9nTsfrMC4 75rSNbiB3TBJDj1X7DRD5z7BNB/UD3mcoM7K9sbHvbaxRCCpIt/sR33BQQO7zL3Hy+IHoPpoCYD5 gSAf+HlsBtpsb/ufNY/7+YQI/BBbMckthB+DAfjU4fgLBFjDgf3KXRiWIPzBiZH82quMnAuQj/oH cneFYF4EgLBMkBNEDigSLDvFBXAwMDGAlAUQIBr+4vEWjG57AMRKgYIgBgwHpaC6oS9DWOsRYlrP 6IFeA4SR3CjBx76Pv6vEaHhEtEKTUCV4LgGgGRaBComZgXMARVKBrCwWBI0QOBuyODZxbcC5BUDI nOaAXGu4EQpUlySwEpzNsoCrkMVE7gPpyKkF6dtV6fl3/9HU5+SHWgmEfgQJnlFQPerxReWExfIu ofd8YxErhn9PSboSBiDIiCyJAZDtF33HWEF0dwxCDAod4SSKmIYwv5YEkky4u31G02mxf8sIA4b9 y/HgIIHpcBI8XtMMW1nAhXEDwen1YBhh0V0BW9Ch5yUUO1FJDi12CvAVR5GP2NaFW0zAVVYJ6+Td wg5zkb6nuSasWdS1UyXI6e08U287zuL1QdhQaFB3yJoFMmdjTP1SWZyqnAgPxIN1kIDyDLsPn9MA Y+KR4NCscy4GswDUx4Gg4xPyvqCIpHxodYqe4YF+pomxqmZ27DV1db1pabuTTeBC4s5O0DcREFAV 5rrkkiqWxhbBMnMGcrWLYz6isBynIQF+UJXsgZETIa0O+R0LNPMxGPmWcCtBQk2rkSSOd4rtpl4K oXsmSDbtpU28P5lIqDwsHah6B/ETYhfzXyxVx3Fob11nyg459XXw/VtpLG6l6G6Tg3RsIYS6CLCk OWvYERyIkEBkeTCXcruRBIUrh0LZKbOczwKu01HqjBHEWsQTxZYsPclgBENcDS812ga5DpVkTIl+ mZNiN246BqtxrhjtgEikk74sdiT0563LVjSE2HK7oMNOpdu5i7AJMZnK44ELOLzqledWE9KdLYd3 2Ol1T2875KiTzFMVePd++5mlEDCidDBTKWG/nVBspEW++lBBiIqYGJ0ukg0HDmFpUke5vBUFe8MP ikdRfXy+R5lEjyPjtbKPmeBT6bheg1BgLkczpAlv/NHFFIipeUoCzGNbExlp1Owk28pMGSPMe9vD LmQJgakHOqAsz5jS3+Yly6pru9vcdZSgLtvKm4s6igPKMDd99ETc2VawIaiEyJEkyYxSDvJnYCJL cbDlADbaazlB93Ws0/QkNjRXruFEr7EfPiXEUlTk1YmXMZTDUax3dFTCiHMDzFjpbh02RjF0YRmK wEfLw5xyuQVNtiZs7yFljm2xtgx59N4H8Q89xTlOoKdCsD6roSsVyJm28DkMjxNhovic/YneOe4g 0S6i860cGgDixMhxrI8p2rYkE7J9JkJmRzDArN5SbytWnoMeFQWehvD40gdinEJ2hshpEaBH4RRE wIYzSIMRBREiQmhhJeHKcOvHTxGqXwjtKSv5MRFmGLiKgvkrLoJC9hLzO0gYjeZf35CjxIsy9Y33 iZ6GDomOFSoomK8rrS1gM7DUXag6LGYY6GyPM5dPBxUoOJIHEETHBwMM0ZiDJHUUlJKSHHcVD3If AkSBih0pH+Qvy9Q2azUEEIwMsbC6YbJy0EVEqAXCwkuqV/O/gc2nvL7zBLZsKZ0YxNiaTE02l6id UV7FZx+aS6y54HcUJ0hyf7voklb0XE4iZD/ov1I5BI8Q8mtIuRM7mCn2ujl33MKIaZz6xxAQ9Rj+ ggmB6EkUypIyWtPFjt4Ud9VVv4FHuYi1KTjkxhnvxSPtEshiWvc0NJlFUWwN7cnI9ZPbpBfVN3yp PdfVhJeom+BYGZkYFtnuNKNiDJiJ8hOio2fBZnyPc5k9Bd5h7mqyRbyGsZ3cfR4TChQRUlEvxiTo HEYhek5y8VPtqXC2/CCXvjCHAYvKheCV3hAtJYJJoNSOZ8echepYTaYqfDeXrn5Hue8Cnc2SLKwg sw00Me5Lhfkhjat0BaMqN0OwoUpAspk6zqJva14Qy0QWctxMrgx0cQBL2TLjuJtXdtP2lc+OGOZo 1rd9muWzHS9JrblszR57TpYBZK2KNTWoqSJjfkKYEUfutEGtYnU0T5DoWev1I9Tbb+teIrzPqRzF jaxjMWkbFYzBtgDaBIVPsiT6usuDr2Y0rGYwPQBwtlx1QfATfGESL4k4RFZY9FRKJUSFk2RA5UCu LnBgZ2EYkXSgyCIwrGBYjAfYYDE6jmdqLzERcGRK4oBMwebAOwOwDsCZgWc1KarwYSBXMHosasYn TJOcnyJloOBFkjCJaonZftuAzyLjceYkLzUZNwmOxrpvMEEieFkErQi8zU6VcU5ecDQ0NdJ2rDqe JkHliyqKiAU1ms3TkLzEVOKXDnnm0CUm1rzITyKDgkPWpFAe/qfMY5FFQNxNSbp4Hz8zcooO4q5m lUSk+huM99XBajeTJn/HkUBrGBiInwHWwtPgYGBrPxvXUlvKCiLzwyJQrHEyJDccHo3kANzQUEkH XoPId5vCfQSoOCNDtEu0SiXlGwCG0p4I/wLuSKcKEh00Si7g