# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20091013015313-om4shxme48r7meqi
# target_branch: file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-\
#   5.1-bugteam/
# testament_sha1: f436e12195971a1d73c8f7ef61556cf0cbcd48f7
# timestamp: 2009-10-13 09:53:33 +0800
# base_revision_id: v.narayanan@sun.com-20091012095559-\
#   xmqbsuqfw1iyiqqv
# 
# Begin bundle
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



