From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 30 May 2011 19:33:23 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v3.2~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa4e9a6412855998cee17fb31cf7dc2d4eaf1832;p=thirdparty%2Fccache.git

Merge branch 'maint'

* maint:
  Rewrite argument to --sysroot if CCACHE_BASEDIR is used
  Fix stats display alignment for preprocessing

Conflicts:
	test/test_argument_processing.c
---

fa4e9a6412855998cee17fb31cf7dc2d4eaf1832