# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@oracle.com-20100917130812-\
#   1betv09fdpv1lan0
# target_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\
#   mr-opt-backporting-wl4800-patchcleanup/
# testament_sha1: 9eb4af1c8842a544c568a70dd816ce65c765c864
# timestamp: 2010-09-17 15:08:16 +0200
# base_revision_id: guilhem@mysql.com-20100916135108-pxv27cyppohf98sx
# 
# Begin bundle
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


