Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 3 Jun 2013 12:49:29 +0000 (14:49 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 3 Jun 2013 12:49:29 +0000 (14:49 +0200)

Trivial merge