[koffice/f14/master: 2/2] Merge branch 'master' into f14

[Rex Dieter]

commit 7fb563d7d15b1c4a9e4997deec52b28e41ea1ca7
Merge: 97cea47 ea8f53b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Aug 21 15:11:10 2010 -0500

    Merge branch 'master' into f14

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