Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 16 Aug 2010 11:05:24 +0000 (13:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 16 Aug 2010 11:05:24 +0000 (13:05 +0200)

Trivial merge