Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Sep 2008 22:16:31 +0000 (22:16 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Sep 2008 22:16:31 +0000 (22:16 +0000)

Trivial merge