From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Jan 2012 11:21:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/automake'
X-Git-Url: http://git.ipfire.org/?p=people%2Famarx%2Fipfire-3.x.git;a=commitdiff_plain;h=7072a3b0fef3aa28e590309a15d2d95ae84e588c

Merge remote-tracking branch 'stevee/automake'
---

7072a3b0fef3aa28e590309a15d2d95ae84e588c