[zlib/f16: 3/3] Merge branch 'master' into f16

[pschiffe]

commit e214043cd378e357b88ba7a1fe83b7978a9465a1
Merge: 698570b 812a7a9
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Wed Jan 11 14:43:54 2012 +0100

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

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