[kdegraphics/f13/master: 3/3] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit 0802adb98f7a0682b50814283285348805cf897c
Merge: caadac4 d38e8e1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 5 15:40:42 2011 -0600

    Merge remote branch 'origin/f14/master' into f13/master

 .gitignore       |    4 +---
 kdegraphics.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---