Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 27 Mar 2009 20:13:08 +0000 (21:13 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 27 Mar 2009 20:13:08 +0000 (21:13 +0100)

Trivial merge