[calligra-l10n/f18: 5/5] Merge branch 'master' into f18

[Rex Dieter]

commit ae540fa336b134331bf866df98cf005c8f66f593
Merge: 82c9768 1cf0773
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 18:24:30 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	calligra-l10n.spec
    	sources

 .gitignore            |   54 +++++++++++++++++++++++++-----------------------
 calligra-l10n.spec    |   52 ++++++++++++++++++++++++++--------------------
 sources               |   54 +++++++++++++++++++++++++-----------------------
 subdirs-calligra-l10n |    4 ++-
 4 files changed, 88 insertions(+), 76 deletions(-)
---