commit 7d552dc5bd0ced820d2d60aa52a2299d2582745a Merge: 654a157 fbd9ffe Author: Chen Lei <supercyper at 163.com> Date: Fri Jul 30 14:08:18 2010 +0800 Merge branch 'master' of ssh://pkgs.fedoraproject.org/liborigin2 ---