# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@oracle.com-20101015144735-\
#   kil26cyxzn3io457
# target_branch: file:///export/home/tmp/oleja/mysql/mysql-5.1-telco-\
#   7.0-spj-scan-scan/
# testament_sha1: e974c8097a6ef3bd341cfd7b0b6d491d765351a3
# timestamp: 2010-10-15 18:17:12 +0200
# 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-20101015134939-\
#   gyyr3z1p31p8m25j
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWusUr0AAYhfgEAQUGP/93MQ
gAC////wUAN6d4Peeeh7uzewkkmip+JpiNTwI00NFNlBtqmhmglJGkeo2k9NTaQNA0AAAAJRJgRp
E/KnppogMmgD0gACSU9KNPUGj0pgAEGAAhgJKTAhomRhKe0p6ntFPUwIeoNGOpXFq54HJXCqStfc
A+r7INY5W9unsiqqZ+KfDYKKZMzu0TY9nfr5vfr92Q0tlFGvbVOnMiajdOWWsQajQRoYYheS38he
MTSGn0wxrke0SRgsRIsgkg+10IpObtyE4iTWGEWSdZWB07TqDEBq2aqI+2EYCWd5nc0lszLAtmrf
wonkQF+p1iNzoxL9uXOZDFpOgkd8Wwee4VAw8S1gjDUblI1DATbro32uCQwp5FqzpZcFC7akgkKW
MBwVXhjN0s3+xpzFnuCxYU6FVZBjh7xpicZNKGC6iuLh4mA43m1f32Hiuu2yEdMKLuIdLUb2YGJQ
Ms6NMgbwYSGZ8lZTOCvRNVKJgWLXEQVHXoqeJNOii+xr3OTi+w+snutVIZKQiLbHXwJMcNm7brtp
eGhgTJVCdtNlIxGGgUoRlAYtrmX3K+bC5UHWIsFcRCEV8jZ1btNq7tSavTg5EJNKwzNo657Sano6
LPvA8crGtrMzbWZRL1wvOF6RvopgDOrbQPaqRHz0SMFys52DuLX2nFTbuAUKEhlICQuqhRNd287M
kZ4r6nSKIWxYSmVqxSWlBYqHqJk849i0h69qUC/HxU4jypLjjvlSH5bx00wV8vPCInizO2xrp22x
xs2jimLoeUy2PVdbqvGGFxIES9hxA+g6lHfpVQdzEkJ/fP7y3uNXEbND5evgOZeHtAR6HqCnW5WY
GuPymh2WmXIW1WxETwmlyu2PrF6B3OYcfh9NEQeqRwHgo8sRZBmdT5A8UQm1Hu6pI0SKFlyw4vkq
SiIcAW9I67inQ/J7yyDIbnOViIM7hFOlrgvKaDl+Mr5weSKrJlbpmFKp64JFIfprGm1RQohhSv+k
dgsWtC0x+Zf9F6BMYGlzGJ5HOiNe9sKvsQOxHjwF4gyYB3cirrsPUjr3KVsp++cLeFJLqMUSNYuH
v0pY3IF/pohJM9+9YmMzak0JV4jGYFFkxL8TL4ZC80YEoRqSnOOhF1stTcxKAtjpZhaEBJGKKBoc
+wqw8wkbqyQm/Au5IpwoSDXWKV6A