# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20091014020048-2gvut610qdavnf2v
# target_branch: file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-\
#   pe/
# testament_sha1: e49316e09dcd8aa6c059f2e79749d569f0971ef5
# timestamp: 2009-10-14 10:02:36 +0800
# source_branch: file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-\
#   5.1-bugteam/
# base_revision_id: v.narayanan@sun.com-20091013173957-\
#   5f696df8miy8bys3
# 
# Begin bundle
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



