Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Jun 2011 12:11:18 +0000 (14:11 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Jun 2011 12:11:18 +0000 (14:11 +0200)

Trivial merge