# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100505104425-39y6qbffgotrhck2 # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: 947460ec7b60d3743d1e4827b5cfbede24312e89 # timestamp: 2010-05-05 13:44:55 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100505103733-\ # s724cvnstmkz9w4t # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWCDP68ADYFfgEAwW////3+3 nwC////wYBA/APQKAAAAAAAAAAAAAAAAAAA5pkZDJghowmCNNGjEDTJkYAAhzTIyGTBDRhMEaaNG IGmTIwABDmmRkMmCGjCYI00aMQNMmRgACDU9UDIQA0AAAAAAAAADmmRkMmCGjCYI00aMQNMmRgAC BUkgTQJpppoAAmgjTIU9NTaj0Em02jRTlX/vzIuFDgTncXQuS5LkpcnSuULOpHWjsR+SPzeA1v72 VTgz1Vnn6Nl+yrkf+/s/b/vm/o4LSnI222Wa2567Pwt2K5ixSjO2b9TWi8pzJzNibCyXulclDnGY 4jNiUppS9paWDNmyZuRLEpNilTOq87a60WYXLm8upC6TK+yTNUk21VbLNZUowtZjjWrZdoX1GNuX Nm0oaX+lKWUsbXbN5/Vi48RrNBmi3UR4k7Y4xSpQUp/f/9BhexEPFtlYLFcxI0qMwBIklKwabC74 AuqUHCsWyplpcMnTWFXX4W7TVfNTHOqp1n2zp6X8hbxXLcfyFzzcxvP/HR8xp8zM/U6mQmQ4lhYf 3DExLFz+GGTxWegocqnl/95n1I0tuLWucBuGS5/dis/+cBc2Dc52K+9oRcHPQfZLkaR0rI1KPcH/ D9jfrYEc912q8tm81/saTJ5k24aHM9sPCveq3Pdl3fF7MG1hsrZtXhd4hBKUOhhAKiWnCSSSXQ0I MwJsKSpMLShAQwxyvFfJE+cJxPxPe/lc5jJ2u13v6vVm+yod5IVIdXW949h8zgXk5x2DqHWOsdg1 DNkU1kah2ko9hzD3txIcg3FGkm4bhuG4bhuG4aA0FHs7mhqeR5VsyXXXf59ZV11V3p6qnGOwwUfg VBRZZJzNiSpgbjlNshyNDecFi9g9zBOSdJxYSjEwfn18YbmysYbSiFFC+EcU1G58ohUvVSqVVVVK Yu4m616yzt13xa1o/6Rg2NY3qG7hv1wVy2QyMRV1SyLLrlxkyXNjRBz2MYn4KiRxMi+NC8lk0IUi SixiVDwZLDMqSMFQalpKosRTeuNJeO8wiReSNTAyYi5tdMXaSoWXtBcilyyyhUbWUl8XKWJfci+M D7Pt9NhpNZxNU0jyaxkUfmOdYssk0c+3C/9iowsZQpee4foLFxGDVBrebAuwIlhrH/QzMzFcc6wk sLORcc8fQuDpkoVEKQaXFYedw1jfsNhrMhoUPwUNhm0HBcbV4v1E1GovL2ls5nM1PHs7rqxvWa12 hucq7PdGfo2s2xqJT/vXma5Os5mpezW0cu1WFR+putWOjTdL6VNLr5GHkWfHVFlLdqTgU5kmBg6y 44vjk5FMl77k6nq90/2yMhR4Pq9HXh2lFOU6nUXjgcvbYjNpk8hiPIeh3GQxjKRyJqWElaDY70+8 zdKcXRO59jQkzZ81K6C93MGEcZ4WNhrLuSbDB3tEk4D3Hr6/yR2smtZuXM1HjGD6T9/q7XEdHkml qnns5znd7tyrzHmN51TSxamaxxfa13tWFV3s2gzZTCKTKVGG20srFTxYeFz/THm1NDTfJ1nPOsue UFfGvR+qIMTmOpJuN5k5jW2sl0G197tahfowdqU5uOGzHVqbZoaO0do1rqgyKhgT6zWsuzLNNFdb 2XFmhJivXyyZqU2XFySy8wWMGhi3r3dofRZ78Wlsjv1paWbHI6CWMmJtbFnMZmJpi9wMjkdr+bQu HB6PtaIPRqf7+amt9Hg8GsZu14Diujkv4ccMOo0MOw6PAeAwcyT+bX07aZ+/LUUJFtWL8W3R4rnE 3vxNhjzYlXxre3qzb9jPEtmzbvewWi83t7yeLmTBsazBtXu2Dlexk2DtcLO0mqa9/Fiuq63Cuwdg 2xz6nyio7Du1OvG7DC+/X8X4NDY78s4pyZmBbQz4Guy+u3Yzyicxc6W0yOpPJ2NnxSco63WS2hy8 1tW/mrG/dfh1DqHBmplnZjT/mXHBc/qumOOthF0vN6yYRtby2PRiab8yzE6EnyLlmhc0rnyO98nY 6zS1DqaupHPyYdVTb0jpGMb4wVTsHKbTQ8mDmNWvpcrddvOyDuvyMoLpK1YqjCruDpLX8kFiQdLY ywKN5sXHMYuY8XB3xwHI0b6dKNOq6/rbeodQ6TljXHaqTeyczgXsFRi05L9cVg1nQxYaXS3L3b1O skFyIM1IgwXLNZj6cpyNxpaTY2nK3KdbxekaXwmpJz7n56TjSYKcHVxiicqS/UTlkmOS4/5ZpgnM Liy4UpkUssWXMm5SjtMlOSUh8VHr92e8+anQuWmktLSvRUsql61ixRT7YpUUHUbChRKLx3PwRnT1 fFewWM1tW3VixYOLi1vqVIP6Q/oP/MjnlVKkqpUlh0X0uFYD+4/wL/8jraxkp++AuHY+QtN7/Iax +w2jB+4raKhuFwszp80Qbx1p3SWKlQd4XOr+OE76kqkfoHBH5PvH0foSj3MxOxceba3PtMj5N68/ go9x8j7TS2huiH18vx1PxOg6obH3PmiP3bnI3GnI1tbSZyTg/jJD/Tu+iPFJysjyh7ngt2R9LuN9 EmP9myIfoodXiU2l2dHfBopC5Z7fwP0R5G0ewsTRGoonQ7Hgo9Xs5Uo9zB5m06GkmsKCz9SjY2Gg 1nc3R71x+iTSd7TE/U7nq9WlJP6CiKJQP1CixYWPV9sJ1uY2HFu6KrrOZm5zJoZnk+Czg0P5uo+7 9TUblm0ZG/qqxrch4PRtzchyb3d4tdzK96pLQi5c5HlCMf7U6txHFnOebHtrGKpb/cuTt+Rk6l7y 8udpiaEmt9zQXrmbkcCTV1MnoHCkPaC5SJvNJtdRwdCX5G0fVpJ0sSud/Kqq23/3ibpoPc5fv9A/ E8yeXlfej3uL5NGTHRTn5Gi4ZwimSinuXIxv0d7se57jS8zLNVdnvuuW095pamh5PJqNL0a0dBLD nWp7zRUYqnIT4MJJvbG70XMSNlSYK0Pf9DrOlN5gdLkjrhHWRbeW8xm4KRwSkP1+EGuNnTqcvEm5 sv8h4C7BpOpjyFR/FUSyk5Bkhc8i4TiwSOcTixcU3mZY6U5UseBk7Fx3uc5Hk0KZGDNqLnmpeYup 3Myi4mhYs0Gp4Pb5dSTNJkk96PejzJ4vWxJ75m+TzJBuOkydUhSNhsSdS5+z0exwPGUPeqPSe0ch iw8hKmXyZJLTQ5vcTF3Ld8xOtIqeE0LBnwVvdz+xJ9YMTWk72TlOkFoYGB3/e8D7lzF8ZJ9g5tzz PdHK/N7KU0vwGLuvqqqql6mawcnvXLnATnbHNDwE/p5R6eMfNuaUe2E+ew/DxfF974vhN6klfc/w xkhmJ3STykhocs+O5Hioe85D5uEOR2MpIfExRvhFIxiiXkXw/scs6yPizWH1fRtjkXobGgU+Bs+y SSa3XHB9kQ630+FPisKiylpKjMdkbHOUkzYPgxd6l7olzkLzJqJ04O8NT7DbGjEpmoptcFiM4mGD xayyoVBgqFi8WerQ6C1LpJHfJI9zTB82p8JpZBSFUhgFk1Y/Nw/3aIe0h+TZJI+Tl2T4lkjhEjYJ 7LomTW2f4hFpJruirJfBx9Enwczkd5gbGCcq9bHnpHi8Xik1uxBoJ6msdce5Zxa4MebR/xBtG1tK fgdW99jyj5pNUHPDygxjocrlj6dHBxq3qwer7INEdS+ZQjRUk95VtjqYEu6XwXLiT5DrfVijsUlz bPNJozsz6B5rSQ2x7lmHqkZdBoHc0xnRks0CjU1NDEaqndKaCldcO04ao5iK9K5g0OovJvJgZiWR pSZOxxqqz7oVIyoO6aZJaNEULdbxd3L4kcjILje0qWWDpC1Wz0XyikxWWbZ7aV7pUwajOR6kcxe1 KwQW+2qswb4x3tV3jeqTqKPHZF5FMJY5VlzfQdhgd7dLalpJypkk2LdCjRSTCNLe1mB0vGfB4dLl eKh/F6IgwNkfa5A0rh8EOdtZPULnoGPFdR7jzO58F5gPq6zqeTlTnd70donhNkp6Ti5HY/Ixbnkd 6yG5e9db724+50F6Rg93M1Lw4d6Nq4abms0uZJyxkwW7H5Ol0uecrohuXvZucJo0rXyPZi9G1vZt b0dMaz/+LuSKcKEgwQZ/Xg==