[GraphicsMagick/el5: 35/35] Merge remote-tracking branch 'origin/el6' into el5

[Rex Dieter]

commit c8d3fcf1f2725762f7aefe478de87d7a638f412e
Merge: dccdf8b f046fc3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 1 14:10:15 2012 -0600

    Merge remote-tracking branch 'origin/el6' into el5
    
    Conflicts:
    	.gitignore
    	GraphicsMagick.spec
    	sources

 .gitignore                         |    2 +-
 GraphicsMagick-CVE-2009-1882.patch |  482 ------------------------------------
 GraphicsMagick.spec                |   34 ++--
 sources                            |    2 +-
 4 files changed, 19 insertions(+), 501 deletions(-)
---