Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 15 Aug 2008 13:55:13 +0000 (15:55 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 15 Aug 2008 13:55:13 +0000 (15:55 +0200)

Trivial merge