[php-magickwand/el6: 10/10] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 327bb15511aa740aeaf048e0968fd11a55e76055
Merge: b80efc7 58509c3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jan 15 18:59:08 2012 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	php-magickwand.spec

 .gitignore          |    2 +-
 php-magickwand.spec |   30 +++++++++++++++++++++++++-----
 sources             |    2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)
---