Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 20 Jan 2010 23:07:07 +0000 (00:07 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 20 Jan 2010 23:07:07 +0000 (00:07 +0100)

Trivial merge