[mingw32-zlib/f17: 3/3] Merge branch 'master' into f17

[epienbro]

commit a5cd572201812d1f760c894300c5916f0ca56394
Merge: 31b7614 15be48b
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Feb 27 20:40:11 2012 +0100

    Merge branch 'master' into f17

 mingw32-zlib.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---