[zlib/f15: 4/4] Merge branch 'master' into f15

[pschiffe]

commit c2126baca550a96eb3f4646bf3da6602406c4bb9
Merge: c97c85e 812a7a9
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Wed Jan 11 15:07:44 2012 +0100

    Merge branch 'master' into f15
    
    Conflicts:
    	zlib.spec

 zlib-1.2.5-zip64.patch |   59 ++++++++++++++++++++++++++++++++++++++++++++++++
 zlib.spec              |    8 +++++-
 2 files changed, 66 insertions(+), 1 deletions(-)
---