Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 2 Oct 2008 16:34:27 +0000 (16:34 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 2 Oct 2008 16:34:27 +0000 (16:34 +0000)

Trivial merge