Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 23 Sep 2012 14:08:43 +0000 (10:08 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 23 Sep 2012 14:08:43 +0000 (10:08 -0400)

Trivial merge