# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: luis.soares@sun.com-20090928230420-9mffmt3uqflnfjjm
# target_branch: file:///home/lsoares/Workspace/bzr/work/backport\
#   /wl4293%2Bb28777/mysql-5.1-rep%2B2/
# testament_sha1: 63201a5632184afdae34d706f41e2c9c33f65671
# timestamp: 2009-09-29 00:04:26 +0100
# base_revision_id: mats@sun.com-20090928114445-fq0vlyrcgnfk42a5
# 
# Begin bundle
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



