commit 97f4dc9dbbe6951276a0dc30ec8212a4d2a01bba Merge: 777f298 f88e898 Author: Chen Lei <supercyper at 163.com> Date: Sat Aug 14 15:06:14 2010 +0800 Initial pseudo merge for dist-git setup ---