Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 Dec 2008 17:17:23 +0000 (18:17 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 Dec 2008 17:17:23 +0000 (18:17 +0100)

Trivial merge