[svgpart/f17: 9/9] Merge branch 'master' into f17

[Rex Dieter]

commit 9bebb73be1e4dccbc32cdf5c8414b7d3f90fcbce
Merge: 98b25f8 6d36128
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:53:23 2012 -0500

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

 .gitignore   |    3 +--
 sources      |    2 +-
 svgpart.spec |   25 ++++++++++++++++++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)
---