Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Jan 2011 18:29:52 +0000 (19:29 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Jan 2011 18:29:52 +0000 (19:29 +0100)

Trivial merge