Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 17 Dec 2012 15:11:53 +0000 (16:11 +0100)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 17 Dec 2012 15:11:53 +0000 (16:11 +0100)

Trivial merge