Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Dec 2011 15:46:46 +0000 (16:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Dec 2011 15:46:46 +0000 (16:46 +0100)

Trivial merge