# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@oracle.com-20110202145111-\
#   m2uuz6ywsxe9vfke
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-trunk/
# testament_sha1: df456c8a5054bc3584ab54c0c952d142bbdd37b0
# timestamp: 2011-02-02 15:51:17 +0100
# source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.5/
# base_revision_id: marc.alff@oracle.com-20110202115259-\
#   p5azio9gpjr5oig6
# 
# Begin bundle
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
TkNZadPd1rpJUkkyiVEv/xdyRThQkEhMsks=


