[koffice/f14/master: 2/2] Merge remote-tracking branch 'origin/master' into f14/master

[Rex Dieter]

commit 5d861194aaa9873900e39951367669f372ddd659
Merge: b66a1bd 8823d96
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Feb 21 14:35:52 2011 -0600

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

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