Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 22 Oct 2009 18:31:20 +0000 (20:31 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 22 Oct 2009 18:31:20 +0000 (20:31 +0200)

Trivial merge