# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@oracle.com-20110524143441-\
#   kkwgelrmmqmx9n22
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 2f2c0b4d82cd4d6eaf8bcdeef5a77fa276ab693e
# timestamp: 2011-05-24 16:36:37 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@oracle.com-20110524143347-\
#   ab9y5kdkff5o54sr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX+Vk+YAAXffgAAQWPf/91Yh
zoC////wUAONe6Jzs7dg11DJI0TFP1DTKZjSmno1PUDxI9QNM1NHqDJSbTVPaYmTSniENommJoAA
AaDQQajSPSnp6hPQmTQAAMQA0HMAmAEwAAmAAJgACSQQMpo0nqbCBGUw1AANA0aZ52XK+f5Yn1Wy
u2KMethAvmfndioW42Hm518NKIh4+5xdzQIBhe4OdLVw+g1TWxHWDjvc71Vcjmuv+kKsxOqjlpX0
kiEawvSKrNys6RDkCJi0ahyhiaD91SyQyvTEiszkinZ1WyjjoiibDSd2kTybkwiOrUevZDkMgnEe
npw2/BripA9Fg8uhrARmD9bAQwKDFUKmrlTIt7HkBB+rJkPHrLUTvi3qpU9JhPqY31zJl7l4DmEV
m1DxsRGrTeYVjGMNYY5ldNR5l77qqBy5sBOtNo8GfL9lBdwJJ4poHWNvZBMYsAe0qSt6qvhSPuLD
dAxoEEUQEzjUWXiI5gHyZD6DzlxsbWK7RpP6444YG+e+ZuGWqIfddkIQLiaShsXcjQmnOJmQHFsc
40WhJJEIEvaesmfVcog0IxN+eiiR3E6QnvBZCo2FLcElnYcDIHagi9SOJvDARY+cYsracSmOLsQi
CiJgxuyqgCjxOJxLvM4lQazRCDbwcFC3nQNApyvKx33kjYGh9ATNSa1kf3gSNslRkvqrI6F0mYkb
Kw4Ww0zMKd5Iq3vnGJCjrYGFIbWhow4UW3KRCQ9pIr4OEKs0cJ4Eh09CoTbTpBRSJEejYNWX3pF5
DaEfa/I+Si80DB8Ijg27VIAaZEubhLXB6uVKVC8RZDSsPMZQNHb2RjfEYgZgNnlpN9yC0F8VDYRl
XTHr0Zs1gYCgYlqhg3pjGHURcuLGMuCqPPPjWEM3nEuKxfUW4cCmYBRIKSXWS5965uow0sb33piF
4ehANH92an8FrC7iEjfDuyPJatxyNhmPWxYhiKjAW/aFoWuDt96RGaQxww8XUiq6FYjMPsfcZxtV
RF8jJ5EToxHC+AraaTUx8Rd45b7KAswt5a4iqbHZAzZQZZJDl3VOUVejcJSDHk+BsrgGRI3EdRuU
ZGDNQa2TIhqWH4HHd9rwspbslYAZ2rk0US56SrhGtVC1wuoiGFPp3l6RbYjaXmLqgEWY0Y60V4m1
QYAxLIxDtyarFTfIltxyW8Yw6FeXbO40aEMEGVuVSR2bKaEhseykgsQdNx2C0lY0AzmK4TINxuF6
22SFkwqCD/F3JFOFCQf5WT5g