Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Nov 2009 08:34:05 +0000 (09:34 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Nov 2009 08:34:05 +0000 (09:34 +0100)

Trivial merge