Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <Stevee@ipfire.org>
Tue, 24 Nov 2009 21:12:28 +0000 (22:12 +0100)
committerStefan Schantl <Stevee@ipfire.org>
Tue, 24 Nov 2009 21:12:28 +0000 (22:12 +0100)

Trivial merge