# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20101207150503-\ # r5tqvnk6vhsd95jf # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 308cc8e9f748963bffc088500206a18ddd263476 # timestamp: 2010-12-07 16:05:07 +0100 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0-spj/ # base_revision_id: ole.john.aske@oracle.com-20101207115610-\ # dutxy558kxve7u2b # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSYuLHcAAb3fgHAQUPP//3ZX 3oC////wUARWZ46GoUTmucCSSNJpgmibFMRgTAjTUPKDQZPImQaEJpT9MU1P0Ro2pA0A0MjIAAAD QQKaZT2qb0p6myj1NHpHqAGgAaGgA5piZMmjCYJiaYBMAhgjAjAJRCYjRppNGUn6Em1NMBNAZAAa aBZAY7pvPz6x1TnZG3DCX784sYcmRxGZCcEntLU15AUmCAUgO8U9uiirXu7qjMy9vMbDIKgkckTy 33KIzTWK/hw+dRt/fr1qZA5Mdq3mZ2zBLsrLKFgyKicwazVPSvPXa6eGQOYTlQLFnnx7JToI6FUk 4bTH1c8wvv0eYo7dRovRbMMscKROohI8OupnzvmmeK6MzkaYKDVOd4iJCpFSwYJ2DyDxDaQKggkI sdKxCS8LQgCdKmhlyUCKFbqmvEIK7fip1J3nXXITAMBUMJu5na2ntGkrpalMoK+AgohfQm/iKtc2 B4wVFYdEMxckTUpqYVZ2JJc5VzibL6bVCkVyMXuYEasOFS1C4V4hhH22vBaJWJs0js3hUG4KS369 pMJFpAYidhmI66NpEHGVplUMUwFkX3JWhUmVi7twkyuC7FJ1iGpNH89t7mc5VApRNCUDAMDXjc0o VWwXaNfIW28gNsiDFFN1b9dC+QjR+USkbjgx9hU9lFvvV8mEFQqaiwV5GFqNqfEr76dT5bkKgi7d 27sekPaVkx5J3M8zmRc29gUU/J4HgPIHo7qggeI64+ryUDwFLh5xZrgh2m7uUISQBqO40/Dx3Hgk bCbPvoeDuM1d2l6ibwmRRySNAardUDNVvgH3/I4G8PFpqDK7Yi9eT952yEhbrwBUuHKOzFhLtEAy RXbSJnnIxp7JhuuRzNjrpffLMllwp4UzqVYnTCaJZMMxBTK8iyj+PAMxyr9/hzrNToEkfYJK0Oa/ GHRJENVZyMlWE2I5+jHF++nLguyvEY6c+NXejifqWsK0yaep72u4MBZCz99UqIuFpWv0QjFg2g69 d6/VmxW7WXVuM1sntOoJ6/XTJ6DEuVy15XdIPB5WXUXKqtI2QN/YSwp20FlNIr6hU+YuWa86odsj k/nrtICpPWA58gwdhVXx5PvgqLYdNofqyc3DxkaY9onrRDQzEeCMg8zDqDmPwZhELWA1KcMB3Bp3 1zRDkRBg9JvywmUTugRDMMgNW24wySVwve8NeiWuaDQiBoYnYtAQA2Kalu2gmh2B6McIbYiQQysC FFNzZli+OUiFQPM4jO0RgpkN9HYpLrZ6fZIpByyOWNWpdsS5Hu+qtWyMy/mBuDXXhtOZG4oUwIPi CZfcBeCUiKPJRB5CefhQOucSR1xY5kwbReYSlb8g2BKQDbQU4Fs6DoNT3gJ/QIg8s9AdmzHUO9EG AWA4gROyEkYx9hUMVoDSWGKWUzapRU7m1zmZxm+NoXJ0iKytiPpDaHwBwzLj10OVU0LqQDrmPuXM GpfsEXoFC85RNjY4jcRwewLw8mQTBx56RSMy8/4u5IpwoSBMXFju