Merge remote-tracking branch 'ms/ccache-update' into kernel-update

author Arne Fitzenreiter <arne_f@ipfire.org>

Sat, 11 Aug 2012 16:59:10 +0000 (12:59 -0400)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Sat, 11 Aug 2012 16:59:10 +0000 (12:59 -0400)
author Arne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Aug 2012 16:59:10 +0000 (12:59 -0400)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Aug 2012 16:59:10 +0000 (12:59 -0400)
diff --cc make.sh
Simple merge
diff --cc tools/make-functions
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Sat, 11 Aug 2012 16:59:10 +0000 (12:59 -0400)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Sat, 11 Aug 2012 16:59:10 +0000 (12:59 -0400)
		1	2
make.sh	patch \|	diff1 \|	diff2 \|	blob \| history
tools/make-functions	patch \|	diff1 \|	diff2 \|	blob \| history