Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Nov 2008 21:11:59 +0000 (21:11 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Nov 2008 21:11:59 +0000 (21:11 +0000)

Trivial merge