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

[Rex Dieter]

commit 48ae933d6210252a6cb5df3af642689f1059e880
Merge: 20f7a9d 8af6e9f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 2 21:44:24 2010 -0500

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

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