# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@oracle.com-20110531131342-\
#   jdicfycmin61rsso
# target_branch: file:///export/home/jl208045/mysql/wl4774/mysql-\
#   trunk-costvect-refact/
# testament_sha1: befaa187028f5447ba3d7e19e1b55b87e0db57e9
# timestamp: 2011-05-31 15:13:51 +0200
# base_revision_id: jimmy.yang@oracle.com-20110531093059-\
#   3x1f93rnspltp3h6
# 
# Begin bundle
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


