Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 31 Jan 2011 22:09:22 +0000 (23:09 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 31 Jan 2011 22:09:22 +0000 (23:09 +0100)

Trivial merge