Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 2 Dec 2010 21:09:35 +0000 (22:09 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 2 Dec 2010 21:09:35 +0000 (22:09 +0100)

Trivial merge