Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 8 Aug 2009 15:53:55 +0000 (17:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 8 Aug 2009 15:53:55 +0000 (17:53 +0200)

Trivial merge