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

[Toshio くらとみ]

commit 7ccecf30bc1587b5a8936fb9437d75240467b3ce
Merge: b06f315 9fec1ad
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Apr 25 09:42:03 2013 -0700

    Merge branch 'master' into f19

 python-pillow.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---