Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 5 Jul 2013 13:18:37 +0000 (15:18 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 5 Jul 2013 13:18:37 +0000 (15:18 +0200)

Trivial merge