# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20090530133228-cmj3fxev6e9jv50j
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b41948\
#   /5.1-bugteam/
# testament_sha1: 09f527763daebea1ca118c7cf54e0cf4678f1382
# timestamp: 2009-05-30 21:32:55 +0800
# base_revision_id: azundris@mysql.com-20090529164935-xe3dceff53d7pywb
# 
# Begin bundle
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



