Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 14 Mar 2010 10:40:33 +0000 (11:40 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 14 Mar 2010 10:40:33 +0000 (11:40 +0100)

Trivial merge