Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 4 Jul 2011 19:05:46 +0000 (21:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 4 Jul 2011 19:05:46 +0000 (21:05 +0200)

Trivial merge