commit 6326205aa8fdf5175b9f6bc41f3351feb076d914 Merge: bd23f78 602d0e3 Author: Chen Lei <supercyper at 163.com> Date: Fri Aug 13 17:44:09 2010 +0800 Initial pseudo merge for dist-git setup ---