[ruby-RMagick/el6/master: 22/22] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 6101497b3d985a7c7d3f276ca5f3fe8d4b52c07c
Merge: 462822e b8dcbe9
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Dec 30 03:48:01 2010 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	ruby-RMagick.spec

 ruby-RMagick-2.13.0-IM-MagickLibAddendum.patch |   45 ++++++++++++++++++++++++
 ruby-RMagick.spec                              |   37 ++++++++++++++++++--
 2 files changed, 79 insertions(+), 3 deletions(-)
---