# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: joro@sun.com-20091120132044-9uyy3rc57kg2rc3i
# target_branch: file:///home/kgeorge/mysql/work/B48665-pe/
# testament_sha1: e95111263ba470b52992ef8ff3ec3fed33eac969
# timestamp: 2009-11-20 15:21:23 +0200
# source_branch: file:///home/kgeorge/mysql/work/B48665-5.1-bugteam/
# base_revision_id: joro@sun.com-20091120131812-6uu32vtez66d5a3h
# 
# Begin bundle
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



