[inkscape/f16: 23/23] Merge branch 'f17' into f16

[Jon Ciesla]

commit 5d1745b2e1bb2d740ce4b1fc1785f24dc88466bb
Merge: 781e394 c82415b
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Dec 18 12:08:26 2012 -0600

    Merge branch 'f17' into f16
    
    Conflicts:
    	inkscape.spec

 .gitignore                        |    3 +
 inkscape-0.48.0-gcc46.patch       | 1032 ----------------
 inkscape-0.48.0-libwpd.patch      |   45 -
 inkscape-0.48.0-types.patch       |   26 -
 inkscape-0.48.2-gcc47.patch       |   22 +
 inkscape-0.48.2-glib.patch        | 2445 +++++++++++++++++++++++++++++++++++++
 inkscape-0.48.2-png-write.patch   |   31 +
 inkscape-0.48.2-png.patch         |   23 +
 inkscape-0.48.2-poppler_020.patch |  683 +++++++++++
 inkscape-0.48.2-types.patch       |   17 +
 inkscape-0.48.3.1-hugexml.patch   |   11 +
 inkscape.spec                     |  157 ++-
 sources                           |    2 +-
 13 files changed, 3345 insertions(+), 1152 deletions(-)
---