# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dao-gang.qu@sun.com-20091009035635-qlh2cx9mt5szxh5z
# target_branch: file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-\
#   5.1-bugteam/
# testament_sha1: 9002eed55da39179e4b9532feaa6438a0f5bd839
# timestamp: 2009-10-09 11:56:54 +0800
# base_revision_id: davi.arnaut@sun.com-20090930230608-\
#   jajp0ho75184xpkg
# 
# Begin bundle
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
0HE875O1kSIn/F3JFOFCQF8DJdg=



