Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Oct 2010 16:15:27 +0000 (18:15 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Oct 2010 16:15:27 +0000 (18:15 +0200)

Trivial merge