commit 5185ca1053269b33e99bd5553bab00b30a008ed2 Merge: bed8289 fb2d6cb Author: Chen Lei <supercyper at 163.com> Date: Fri Aug 13 18:22:25 2010 +0800 Initial pseudo merge for dist-git setup ---