Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 26 Jun 2011 07:16:29 +0000 (09:16 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 26 Jun 2011 07:16:29 +0000 (09:16 +0200)

Trivial merge