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

Trivial merge