[calligra/f17: 16/16] Merge commit '5f39594bbcfaadc911978fef80392cdc3c1e4714' into f17

[Rex Dieter]

commit 4a9bf457f69267ab145818ddf7a8b5a07540f4f4
Merge: 2738312 5f39594
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 10:32:44 2013 -0600

    Merge commit '5f39594bbcfaadc911978fef80392cdc3c1e4714' into f17
    
    Conflicts:
    	.gitignore
    	calligra.spec
    	sources

 .gitignore                            |    2 +-
 calligra-2.5.4-tables_to_sheets.patch |   12 ---
 calligra.spec                         |  152 ++++++++++++++++++++++++---------
 sources                               |    2 +-
 4 files changed, 115 insertions(+), 53 deletions(-)
---