Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <Arne_F@ipfire.org>
Thu, 16 May 2013 13:47:58 +0000 (15:47 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Thu, 16 May 2013 13:47:58 +0000 (15:47 +0200)

Trivial merge