Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 3 Jul 2011 09:03:57 +0000 (11:03 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 3 Jul 2011 09:03:57 +0000 (11:03 +0200)

Trivial merge