[GraphicsMagick/el5: 24/24] Merge remote branch 'origin/el6' into el5

[Rex Dieter]

commit 26c6d1fb1c314f08544982616cbfeaf1111d9cb8
Merge: c8d3fcf 3d2a6da
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 1 14:49:51 2012 -0600

    Merge remote branch 'origin/el6' into el5

 .gitignore                               |    4 +-
 GraphicsMagick-1.3.14-perl_linkage.patch |   12 ++++
 GraphicsMagick.spec                      |   98 ++++++++++++++++++++++--------
 sources                                  |    2 +-
 4 files changed, 89 insertions(+), 27 deletions(-)
---