Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 18 May 2013 14:53:10 +0000 (16:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 18 May 2013 14:53:10 +0000 (16:53 +0200)

Trivial merge