# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110202081309-\ # zj3o05718xcbrne8 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-trunk/ # testament_sha1: 7d872686b64ecd3a72e12837fc1949a491ee1409 # timestamp: 2011-02-02 09:13:16 +0100 # source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.5/ # base_revision_id: ole.john.aske@oracle.com-20110201142457-\ # 3hdefsxj12q0acvl # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWJNKasAAnZfgAAQWOP/93MQ gAC////wUAT4nhpcJzru3VQ61hJKGpowUT3ppMnqnqeJo1TQ9QD1ACURNU9iZMknpNqAep6Ro0AA ASJBNIyCanmlPyo9QBo00HqaNGGAAAAAGg0AaAaASSEaaBoI1MAkep6NIGg00epbdsy8AHvf54nh 488uQLHXPhSYKbS2YEsqDLRE+d26US7buB2mY20Da6/cFynVmx7Gm9T34vbJUpW6e12ZE6zrOKUl 3YM/hhukd/+6//SvEi1/FzL2p/rOQRzvxldOUPt3HHDZSskV78ybECyYPCFFEnM5yWhyPxh2QeLT ngBdQ0lIlcCThPJaJh5MgyZHJkeMnPCsNubxA8KagZCeBfmcQI2apRAfECXiite6JFT4FwKLLn6U IWhd0khRQyGAf8aHigFI5ov1YXO/iMAOFRl7A5FPqpe9+wmRZNeF+q0oRQPbsxxmA4JlG+40YNKV XnbjzQGCES1XDGjcxsfpRxspHjCJlOyIRie8sc8IzKounYnNncxpSBlt8HxyJNTIfRBaVvqyUyYa 0dcgKczseUitsSY88GNgyOWTnmLlvKkPT5Gxxkh0EXFa2ocpSnSm7GFMyi0ai/DXUMfWjTajIDvf dMcbR9lcxuK6lWiRsOBjkGDYsSVmFhjE3aayb6vC4SRInrG9hWmxkoISUCLpWujFcHTC3iNU3Diw cqQUmEKAWVpheRGvxmSfBsbyFl+BAlmVqangMR1JANhKMRgwH26sn0LxhdEoXkJuGLdYwvs674VW KkgcnNXIrc812cuBeM+ZijP8HSglfe4bTb/cZzd+smlAo1IPZ9ZIYtpJ+WhBb3H0YluuRNXLMifa sqmiY0pZHvEoLSY09fhmHQoGOhoRrAhikrbs3FpoSxLLDkdQNSVszkf2ccenlIzCW8SyzwNRQLks TPXrhSWaynIvCoMSA/QiiSDr5eM6rjVD325J9ffvryY0YSTN8sNiF5obk8n37HIBA3ExEu2G1WXE UMsl21Y9AfnnSKyzHoV04a8b9HWDovJMN+pieUfLSOkdNJobLIWlL5I30RXoXhrrmSwIPMDE05+q ntXgyNyq4yKypGslQ7DJ1zIq4etRuF2RZAebElTMFuJ2uadXdDQ4LQWHYgeRxsE9FnbL9YQdBFBB D955/zcU+yO+wHcS7XjMR6nImWJKcuCOkLZA5HzJ8odhl+Dv5ExLkJOMAYZukewl5FfSPxoQuAy7 KgzmJchw5ycbcCX0JtJ2EmBwupU5FYEIPKWntOJ4CgwMuuN5MC2w7+wIxR+zomHee9C/oyvR8rC/ uJTRe9ZoPhBeHHqLhSKrBhg/JBRcS3UNgeaLeVi58yziOm5BrIJB9eZiPilEDL0cxj0grCiKdWBO GdCChoMs2qjZdGFvBfNZaNSQ8wQYfFoid8w35EUDQ0VV3pRBbehyE3JHmBdCh5myYw3UdovKPoDA 3RBXtE/hiqi8TUxpo8yX3E45Fig0N8gPiRL/bGFKFwbDeQMBdC5Z9dEYmSPTZBrTVVH1AfNEUYLc SNFiXKPSIF0Kf4u5IpwoSDEmlNWA