commit 7e38e5f2ae30bd5674f8144947634fc62d8b0416 Merge: 00e958a 69ca985 Author: Chen Lei <supercyper at 163.com> Date: Fri Aug 13 17:42:59 2010 +0800 Initial pseudo merge for dist-git setup ---