# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@oracle.com-20110324075719-\
#   8ddugnaldflo50sl
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 6a23c166f4eb6546d1fa41928b8dd258fdd98cca
# timestamp: 2011-03-24 08:57:23 +0100
# source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@oracle.com-20110323140743-\
#   8fr8njy81ok81cn7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRCkkocAAatfgAAwWOf/93o3
2mC///9wUAPntwm7vb3rMeksEkk001NNDET0KfhU80kMhp6I0009Jp6mjQZRMgYE0TUzakaDQAAA
AAElAJimmjKn4lNo9UNpqaDT1DTIDQAGUgIaNGgAZAyaaAAYmEZASRIQ08pknlNhT1NJ6ntUek0y
AGg0NNDsOz5qZMu5VLYNpMVZrwlTcneJLNILVkpEa32wvhB8XX6FGzuvZmDl+Ec3wY3sDmHMvCGR
3BubcfLn/peXuTBtZVUQinmgEqqPKGWPanZHpWiZuQZajAkfsRTw6g5GVcvjWF/NOfC59kLFtlYS
KwiZBDwb7lOWoGpEEMHOZPhBrh/Boh1uNzkGyS4IK+klOagFitqPdQsJi6lf7ly2IxtanQL2GlvD
WgzLuMEHiMiJCMtWGMibeOWZIsqDlmu0/Vr6Fxhz3CgUKRU3Xw5eSKyPHKjjaO3AmYwaWyqmsFsZ
dAOtzR+Rd0vN61axzbAkVnFI0LICOOAdqxkGlzlwDJ6Y66a4lQKDghpYm2Uc6VBwep8r5VWjYqEd
YLtmhBZEFmiWNF51bSpPzTD37FeHEc25ltOBtNIrguQTa6VjjPIYZ+nInrp0BUXrpW21h9WN9M9W
2wUWV6tgLK6mx5srtoL6bTSeGuOpipXoycyGTTawGScmSZAsCVjOJf04T3N0aYduj1BEQxA1k2EF
A56CsVFZAZTFKogCQEOKz2CwCsDUBSUI0Ti6lRo6HIk9F38etQXovpMRIA71kxibn3/X5CJupG8M
IrAkD2Ik5SI2sITcSNsvRzUBt2/xDhzWALGKXTdZiool12KBIa8l/d119TsI9S7udI5uBrAmTTti
r4Pxa86RSU0GqdAFn6cgbng0hNfdkD20kAwnUhsBv78cJ0ir7GDs0Qkyj8Z9xMrHhNH2GzbHK1XB
NlzRbP5OKLlE8UywT9tjoXXbHg0ROTp1cFdYWl9S6Omgrj438bRYOHnipPmnRPsgLf0NeDatMAkf
xc4L5FSJi76YlXfyTUWnFFgQKwkvQEn8b7JrAwC7qhnw6TtH7EioNyypatUgrgYNTYgwRdEVvF5O
ahE0hpBSjtrmJlatmI9HM3nDy0z1mUXvOxmkdGKMXJEYbSxPQm2Cu0zB3/Uvpn00PHNdc0qDBEGT
K2+u4UKw+2aSvW5Wloz8GpBRDsc1kvv+BHIIBm6w0xwtYxf15CFbN8rAzXMSTd8+J0PTrkwS9b1F
EZ06mk42B573XdkYhWUtdyjNahzG7A3A340SOSKLrb3Hx80ciuphkVBJzKEjPmNG9Ovd+joHHfRR
/iginsl0YWepRnvGO0jdv0mgKQkZZ7d6YUtNLl7W3B98ittBjg5Zl1rteQ4mrVWZP+LuSKcKEgIU
klDg