Merge branch 'next' into core63
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 3 Oct 2012 14:32:02 +0000 (16:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 3 Oct 2012 14:32:02 +0000 (16:32 +0200)

Trivial merge