Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Dec 2010 14:32:19 +0000 (15:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Dec 2010 14:32:19 +0000 (15:32 +0100)

Trivial merge