Merge branch 'next' into arm-port
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 24 Sep 2011 13:57:29 +0000 (13:57 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 24 Sep 2011 13:57:29 +0000 (13:57 +0000)

Trivial merge