commit 976a3d6472d3ebdf2d882dd1028f67acfd7d64f0 Merge: 14af83a d10c934 Author: Than Ngo <than at redhat.com> Date: Thu Jun 9 16:27:31 2011 +0200 Merge branch 'f15' into f14 .gitignore | 1 + kdeutils.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---