Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Nov 2008 23:47:49 +0000 (00:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Nov 2008 23:47:49 +0000 (00:47 +0100)

Trivial merge