Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <Arne_F@ipfire.org>
Wed, 3 Jul 2013 16:38:16 +0000 (18:38 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Wed, 3 Jul 2013 16:38:16 +0000 (18:38 +0200)

Trivial merge