this is an update of zlib from 1.2.5 to 1.2.7, the compressed changes are
attached. No merge glitches. Ok for the trunk?

  Matthias

2012-11-16  Matthias Klose  <doko@ubuntu.com>

	* Imported zlib 1.2.7; merged local changes.