# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20090928053402-ho6sibfz6p8siwlz
# target_branch: file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-\
#   5.1-bugteam/
# testament_sha1: f8d47dd7e3660ea5dba9f44fe55cc42e297245c3
# timestamp: 2009-09-28 13:34:23 +0800
# base_revision_id: joro@sun.com-20090918131958-2238vzh7ibvrolhc
# 
# Begin bundle
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
wnDlvg==



