# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20091002081840-uv26f0flw4uvo33y
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/backport\
#   /5.1-rep%2B2/
# testament_sha1: 4d392bfbe90063add1081904ab7bdd7309b0a026
# timestamp: 2009-10-02 16:19:15 +0800
# base_revision_id: zhenxing.he@sun.com-20091002080733-\
#   6mn49c5hizl3ctjd
# 
# Begin bundle
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


