[libpng10: 7/7] Merge branch 'master' into el6

[Paul Howarth]

commit 4742e99ed329ed026c9f0d71a59f24d3e202cc74
Merge: f5c8898 a6634ec
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Jun 29 10:34:17 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	libpng10.spec

 libpng-1.0.54-CVE-2011-2501.patch |   21 +++++++++++++++++++
 libpng10.spec                     |   41 ++++++++++++++++++++++++------------
 2 files changed, 48 insertions(+), 14 deletions(-)
---