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

[Rex Dieter]

commit 97cea478d0213309e73e6571e84be1b58836c9e7
Merge: 0203ab1 473ee4d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 19 11:01:35 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	koffice.spec

 koffice.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---