# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20090531005312-x5y9fend4xf5n5yx
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b43263\
#   /5.1-bugteam/
# testament_sha1: 8d33bf2b778566badce39c5a4270d5ad72d82b61
# timestamp: 2009-05-31 08:53:30 +0800
# source_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b43263\
#   /5.0-bugteam/
# base_revision_id: zhenxing.he@sun.com-20090530135409-\
#   kmpnwme4ao9srac5
# 
# Begin bundle
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
SECuhrgA



