Merge branch 'next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 1 Oct 2012 06:22:34 +0000 (08:22 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 1 Oct 2012 06:22:34 +0000 (08:22 +0200)

Trivial merge