Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 13:40:45 +0000 (15:40 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 13:40:45 +0000 (15:40 +0200)

Trivial merge