commit 9517a940ac2f1233664788ca85d7cb180eaf8547 Merge: 223307c 8e5da2c Author: Chen Lei <supercyper at 163.com> Date: Fri Aug 13 14:32:19 2010 +0800 Initial pseudo merge for dist-git setup ---