[python-pillow/f19: 7/7] Merge branch 'master' into f19

[Sandro Mani]

commit a1a1669185886b5fdae7585ba6d0109c564c5368
Merge: f4b8b78 c216b5f
Author: Sandro Mani <manisandro at gmail.com>
Date:   Sun Apr 7 19:44:31 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	python-pillow.spec
    	sources

 .gitignore                    |    1 +
 python-pillow.spec            |   12 +++++-------
 python-pillow_webp-test.patch |   11 -----------
 sources                       |    2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)
---