commit dc40f9c13c4ff7a91fa3c4fdd24c461dcc9a87a7 Merge: 297011a 64072ff Author: Chen Lei <supercyper at 163.com> Date: Sat Sep 18 12:36:27 2010 +0800 Merge branch 'master' into f13 ---