Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <Stevee@ipfire.org>
Tue, 1 Dec 2009 20:49:00 +0000 (21:49 +0100)
committerStefan Schantl <Stevee@ipfire.org>
Tue, 1 Dec 2009 20:49:00 +0000 (21:49 +0100)

Trivial merge