[koffice-langpack/f13/master: 12/12] Merge branch 'master' into f13

[Rex Dieter]

commit 770d2a25fcc1a578572219a565d8b1315e2084b9
Merge: f3d4e05 5057cbe
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 20 19:59:43 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	koffice-langpack.spec
    	sources

 .gitignore            |   49 +++++++++++++++++++++++++----------------------
 koffice-langpack.spec |    7 ++++-
 sources               |   51 +++++++++++++++++++++++++------------------------
 3 files changed, 57 insertions(+), 50 deletions(-)
---