# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@oracle.com-20110221102439-\
#   xx12z0linjgzg47p
# target_branch: file:///export/home/jl208045/mysql/mysql-trunk-59793/
# testament_sha1: 6928aab4edf37325850d69c083d874570512dec4
# timestamp: 2011-02-21 11:24:42 +0100
# base_revision_id: sergey.vojtovich@oracle.com-20110221082302-\
#   wfel5gbwf9szr1gf
# 
# Begin bundle
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


