commit 5828e2159c11d14193872b3a95db16a7aa0d2514 Merge: b13ecb5 f8ecdb6 Author: Kevin Kofler <Kevin at tigcc.ticalc.org> Date: Thu Aug 12 01:21:56 2010 +0200 Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/kdevelop into f14/master ---