Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Dec 2012 21:52:28 +0000 (22:52 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Dec 2012 21:52:28 +0000 (22:52 +0100)

Trivial merge