# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@oracle.com-20110512121540-gp6wo3z99ba0cwlp
# target_branch: file:///export/home/x/mysql-5.5-bug12346411/
# testament_sha1: 2572f79233ea0360ee0604bded5044e27137b097
# timestamp: 2011-05-12 14:15:42 +0200
# base_revision_id: tatjana.nuernberg@oracle.com-20110512094117-\
#   vcrvqkqyd2kyr4pv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSpLnEoAA6jfgEAQWOf//3//
/+D////4YAjXa+9mKAvZM31pRRR0aCSUQw0VMT1GgA0NND1AAaAAABoAAGk1TynoynppT9BpGiaN
AAAAAAGgGhENU8KBoGgAABoAAGTEAANBIimhpBkmJqn6ZT0k9TT1PU9NMkaNAaB6gA00DKUZA0AA
NNAAAGhhGgAAAEkhMgCYTQBDTTQEk8mkeUPJ6ptJoeoHqeocFJiMqCcNBEaRhLMj2ryoyha6bWXh
hdPOaDS0CVIklUEtZXRLG20DBjA/pizZuXkpmjldotx2v8Ke6PyR4So0SCDJZgQQ4Fkk4VQjIwYN
6kCuGoPQCUh+obqc9m+kOQl2ONldSZ2Lkc3gda9vl1ek9hEJ/oEEgeJBxkiPzIjDEAfA5jAwx8lh
MROrfyy65EN7QeBTLCdPpCUorlUD410AE4dik7+YakTgNTGAQ6gH78G4RY0krHVminrZxdoWxfdB
t0M8RMPgICC0LrxTmNjwN2BEZrHLIoyauZ5+7Z4cT1Xno49vbf6l3el96JaS6/azDYKScItOg5d0
KPEePIiiGjt5EA3a7EPPv3DZm8NQBo+x/HWyLxGibQ7qNB43bTRDHgtJRpizrI7HGj1TwuyAObgX
evFVMHjxD+q49hPfUn5SBZtZRAvWIbfOc9jBts2EECTkhSSrhoXzt1D98I0tJEoPTDoKVZUiC6Lg
Vm/UItKigpsp4l+9xgFsXLgSTC5kRx/MTBksvOg9WPgxSJXtDmY+OxSEpbQepRk+pMwisRgfBc9t
oWRrIbHwKNFu1DLZdIR795WG1rVNkWErt2qVC2mb8KnXreXrZBxAkX7RbgwMbAmYAtLeEK1IZItz
cI/779HGmYzYKCzW+1zWGeJuIhea3C0rqGtwiUtuzHExgnG3vk7sprfpp0QCnFdhi6JOWgyUTbPQ
WXSdWPxM7xFlqRejFSnuupRlNgzotChzdO+b294V2mJZmN3CHiyctFy6hr5K4sIPIEjEcbWBQuj+
rBBWpUGYlRFhfPXEc4aTzcWEigbOcrKI6KVlQbCwLCG1MTGBjhxpnRUVHaaB/nSaRqKB/lzEW3sF
JoKrcR/SHaTaVdMig8GG3L7XQg8hgCQ18+SLk0LDnndCiCUkE3Ek8NZQ5czRMJgqV1TWQcDmuONE
5GRldEGCRQeIhYc1MvQIlXXGGJZnEXm33bShRRmnxWrG2ykxLL9zoUtkIpKHDsC8Vsq6JPP4Pq+W
wbb0lklI+gJF+Ia/Z8unBXmbmZ3RPewbwneHs/FPRdN09FOkemAA0A4fII8AOFMDuPkM7zrAnSSg
oKOgASSzPBaLBkBIIqtRgH1UE3zLVcMDIcJkWOThfUxSX+CGYH9lSF+agVPaWH+poMlgYiJSWlKh
zhlA+y/MCtdiqEOJBakfsKAQQKoRitYPSuDyFZQGpYr/ygZqoIkRgpCtbEbgmEPBkMYiFaZhK9tV
RaHOGknSItGFRwOwLAJBJKCqCIiYJiccxcIxcYwBb1WUjGNy3B08E7tSYTcufolMBCY7hWL9gahS
ETgfIoJz5SD1+f6lNs0j6TAEEVKHw+BL2wdBQIyF85W/Q8rvjOsVbnNTPuWeExfNzS0ln2F9YVGV
1muxZSnW9Q1P7pkj15X7WXyPU1fHX9D9CdI3iJ8igxH4Xreb5jpaMx8e80bw32D/Wj6HkBeon6S+
hpyzDopONtZ6mC/XDWSHG+GV/ZI2Zdqoe5wBUgLFkyc1F31UUYiOrGkzOgz39JEtQzYpvHuMuz3v
1T5bNHUVNCWGCI6OBcILhRtNiCnv5Vua5v7HQf4B4842pVcZqNGp9NT9iOJN3zDmXYyncPIpBwJH
Uxy0s/maib2PH+itXAO23g5M4tVAmIFhde2xOksYDXPygl29d+LP7NccGicMa0X/MxU8qLQLCaA0
BABSnC/JjwFYsrLSvEZQzG7G+0/laD5sabnimSmnOthtxxOW05G3vOs1P7TxGnlIY8O4HlobPsui
zDrMdOHO+J0kbb+shxqoG60yG8OCegzS5LJSBpiQJxn3CPMibu0gxYBqyNhrXmkXkLzMHsrPlsIl
duCUrhw0xsxeXCnclCR8QprrCkJ1yeZoOER46Pws9Bbwvnq0FAj+5elX7+eymelFgvI8F2YeB7BR
spnHF8482c9U6fYFXtPaDK/DOhU39RxKSFuoXkPNq6KfzTigPwyFlxIERj89WB5KoAYTl5W2goO3
yN7m6t3McgwESliYbvyxfju9ACga3rCqARVN5abgppDznkD+yr093eR0lhPQMzDMzWLSKvDvICiy
1K8uTLL2u0kRc1cDMLi2RHSNBXWg4K21FahmavabFqVZWvsWR0aIpKRn4HK4kgbjV57gDkJFX3ZU
MdSQyOExoqNDFh9wB4s8feMqqJ+clJzx0CJ3kAP4d2CDjrxRp4iN3FLqhNDtC/HCwsyjlJHenx/6
DDm6mvjOGbI3mw8q2hNOyi17fNEeeOMmI+5WALHyckSVtfWbSVIn0uQXJNNnrkElONdSt3T3RWxp
Ks02lFLrl0LIJUUJtVcbVMLoI70/prLN9l7VmhzntrNJxRwg00qa6bWpcHQzUpuvFWxYI0bsO9fI
8/FYlE8mLQGjLIU6SnZZ8Ou/B65mTXBMSUpNWRgAt/TlhausVxkXwixRryJOM43XyUJGgpE25wcW
GZN6StptK+CPyiuurCshIT08BihkXj+xzGyPDw0Tr4rnWCynMah0m8YOqt3c4dKuCyVBUt4DjSuL
gM+M51FyMRo69wjqNgjt1V0ijPcl5v0bWqcOtbw4K6ww/cd6evwPcI24hZCcR/xdyRThQkCpLnEo


