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

Trivial merge