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

Trivial merge