commit 5cf3877eac1dfd96a363aea30dcadf1238ac0eee Merge: b831733 2d845f0 Author: Chen Lei <supercyper at 163.com> Date: Sun Aug 15 15:51:47 2010 +0800 Initial pseudo merge for dist-git setup ---