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



