commit c6d016a3ebd0f6331cf87707824bac30f918a971 Merge: 07d42d7 ef6bbc3 Author: Chen Lei <supercyper at 163.com> Date: Sun Aug 8 07:26:28 2010 -0600 Merge branch 'master' into f13 ---