# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20090713040135-d0rkh25ailziv18x
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b37148\
#   /5.1-bugteam/
# testament_sha1: 08a1de8a9dd503732b138cffd97653de567fd37f
# timestamp: 2009-07-13 12:01:53 +0800
# base_revision_id: aelkin@mysql.com-20090623091004-x0q3ig5ktrwf7skf
# 
# Begin bundle
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
Hef5Xq5jAQipJD/xdyRThQkNO6QqkA==



