Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 8 Jan 2012 15:38:51 +0000 (16:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 8 Jan 2012 15:38:51 +0000 (16:38 +0100)

Trivial merge