# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@oracle.com-20110429091314-\
#   7c5oqhir1ikg3e42
# target_branch: file:///export/home/jl208045/mysql/mysql-trunk-\
#   11765831/
# testament_sha1: fd60507ee846531e5c56fe20a056cd0e4efb60ae
# timestamp: 2011-04-29 11:13:18 +0200
# source_branch: file:///export/home/jl208045/mysql/mysql-5.5/
# base_revision_id: jorgen.loland@oracle.com-20110429080204-\
#   ql1kyfu0nt9ygdp4
# 
# Begin bundle
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


