# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20090530135409-kmpnwme4ao9srac5
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b43263\
#   /5.1-bugteam/
# testament_sha1: b85fc46ce08c314e773e3f5b9c335c90203644dd
# timestamp: 2009-05-30 21:54:31 +0800
# source_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b43263\
#   /5.0-bugteam/
# base_revision_id: zhenxing.he@sun.com-20090530134930-\
#   vxpeitvquxl7d1j3
# 
# Begin bundle
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
rSyj/+LuSKcKEgATH5zA



