From: Joel Rosdahl <joel@rosdahl.net>
Date: Tue, 2 Nov 2010 06:40:25 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v3.2~297
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab0319f23ad7f36fdb76a5227fa8a530552d3b01;p=thirdparty%2Fccache.git

Merge branch 'maint'

* maint:
  Fall back to preprocessor mode when seeing a non-regular include file
  Properly close fd in manifest_get if gzdopen fails
  Check for CRC errors after decompression
  doc: Sort environment variables correctly
  Minor doc string fixes
  Fix NFS object corruption
---

ab0319f23ad7f36fdb76a5227fa8a530552d3b01