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

[Rex Dieter]

commit 0418164d1c7381ab510fd97c823d05b5e130281d
Merge: c3b36f2 48adf98
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 8 20:40:43 2011 -0500

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

 koffice.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---