update 20131126
qtz_dell
fix conflicts