Merge branch 'master' of ssh://stevee@git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <Stevee@ipfire.org>
Fri, 10 Apr 2009 21:22:12 +0000 (23:22 +0200)
committerStefan Schantl <Stevee@ipfire.org>
Fri, 10 Apr 2009 21:22:12 +0000 (23:22 +0200)

Trivial merge