# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: zhenxing.he@sun.com-20090409062418-06i4j26z30sqdpg3
# target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b37145\
#   /6.0-bugteam/
# testament_sha1: bb42c541207a1d7229e1e159318a6750d2707c95
# timestamp: 2009-04-09 14:25:32 +0800
# source_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b37145\
#   /5.1-bugteam/
# base_revision_id: zhenxing.he@sun.com-20090408234645-\
#   gk8d0jbmq74vqv9z
# 
# Begin bundle
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



