commit 7f626bb8cdfc3b6d6e70bdbda7cf6bb8899666d7 Merge: b7357bf 26db930 a96aad7 Author: Chen Lei <supercyper at 163.com> Date: Mon Aug 9 10:51:43 2010 +0800 Initial pseudo merge for dist-git setup ---