# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: joro@sun.com-20091127103215-xbnuf3d800lmvgyy
# target_branch: file:///home/kgeorge/mysql/work/B48872-5.1-bugteam/
# testament_sha1: 92467804d975ee8ba5aac29950f0ef7ed9f9ee9f
# timestamp: 2009-11-27 12:33:29 +0200
# source_branch: file:///home/kgeorge/mysql/work/B48872-5.0-bugteam/
# base_revision_id: kent.boortz@sun.com-20091127083511-\
#   dqyetiycohpq0xfx
# 
# Begin bundle
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
mg7MV642N72mbi9f/4u5IpwoSFAFo90A



