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

Trivial merge