# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kristofer.pettersson@sun.com-20090306092411-\
#   ha7yuuizl5zagkso
# target_branch: file:///home/thek/Development/cpp/mysqlbzr/mysql-6.0-\
#   bugteam/
# testament_sha1: ccc09a4cef0bd533466288af1ac5dd7b920650f7
# timestamp: 2009-03-06 10:49:49 +0100
# source_branch: file:///home/thek/Development/cpp/mysqlbzr/mysql-5.1-\
#   bugteam/
# base_revision_id: v.narayanan@sun.com-20090306052803-\
#   qgaayrb9gppi418g
# 
# Begin bundle
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
UepBHVpG/8XckU4UJD+i8w0A



