commit fca27d0a12b62e1eaeb79f5b41ac604646ba645e Merge: 4b0d438 4f06583 Author: Than Ngo <than at redhat.com> Date: Thu Jun 9 15:50:39 2011 +0200 Merge branch 'f15' into f14 .gitignore | 1 + kdebindings.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---