Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 28 Nov 2010 23:01:46 +0000 (00:01 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 28 Nov 2010 23:01:46 +0000 (00:01 +0100)

Trivial merge