Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 16 Dec 2010 11:56:46 +0000 (12:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 16 Dec 2010 11:56:46 +0000 (12:56 +0100)

Trivial merge