Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 21 Oct 2009 22:23:11 +0000 (00:23 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 21 Oct 2009 22:23:11 +0000 (00:23 +0200)

Trivial merge