[calligra/f17: 19/19] Merge branch 'master' into f17

[Rex Dieter]

commit 1ab40b77d3054c6c65d3f07fa8a23e9557da51df
Merge: 91959cf 46f0bb3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Aug 4 17:10:27 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	calligra.spec
    	sources

 .gitignore                             |    1 +
 calligra-2.4.91-tables_to_sheets.patch |   50 ++++++++++++
 calligra.spec                          |  138 +++++++++++++++++--------------
 sources                                |    2 +-
 4 files changed, 128 insertions(+), 63 deletions(-)
---