Merge branch 'master' of ssh://stevee@git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <Stevee@ipfire.org>
Wed, 18 Mar 2009 14:37:31 +0000 (15:37 +0100)
committerStefan Schantl <Stevee@ipfire.org>
Wed, 18 Mar 2009 14:37:31 +0000 (15:37 +0100)

Trivial merge