Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <Stevee@ipfire.org>
Wed, 20 Jan 2010 22:58:08 +0000 (23:58 +0100)
committerStefan Schantl <Stevee@ipfire.org>
Wed, 20 Jan 2010 22:58:08 +0000 (23:58 +0100)

Trivial merge