Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 29 May 2009 21:17:57 +0000 (23:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 29 May 2009 21:17:57 +0000 (23:17 +0200)

Trivial merge