Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 17 May 2009 12:32:11 +0000 (14:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 17 May 2009 12:32:11 +0000 (14:32 +0200)

Trivial merge