Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Aug 2010 17:09:25 +0000 (19:09 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Aug 2010 17:09:25 +0000 (19:09 +0200)

Trivial merge