Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Feb 2012 20:47:09 +0000 (21:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Feb 2012 20:47:09 +0000 (21:47 +0100)

Trivial merge