Merge branch 't/distcc'
authorAndre Noll <maan@systemlinux.org>
Mon, 26 Sep 2011 21:53:35 +0000 (23:53 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 26 Sep 2011 21:53:35 +0000 (23:53 +0200)

Trivial merge