# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@oracle.com-20110606124610-\
#   mcfesddadp0jlnau
# target_branch: file:///export/home/jl208045/mysql/wl4774/mysql-\
#   trunk-costvect-refact/
# testament_sha1: b013c253bde0b6842d3d26c2e1fd90d5a30a1ec3
# timestamp: 2011-06-06 14:46:19 +0200
# base_revision_id: georgi.kodinov@oracle.com-20110606102945-\
#   eqfo51a64b4qg7i7
# 
# Begin bundle
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
JBnuVlFA


