Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 22 Aug 2011 18:53:02 +0000 (20:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 22 Aug 2011 18:53:02 +0000 (20:53 +0200)

Trivial merge