commit 046d5b6d88a15093e94b4515a4604e4cd93da7a5 Merge: 92c6bdc 1d0dba3 Author: Than Ngo <than at redhat.com> Date: Tue Jul 5 17:50:11 2011 +0200 Merge branch 'f15' into f14 kdegraphics.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---