Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 28 Feb 2013 23:07:49 +0000 (00:07 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 28 Feb 2013 23:07:49 +0000 (00:07 +0100)

Trivial merge