Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 13 Sep 2010 13:57:05 +0000 (15:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 13 Sep 2010 13:57:05 +0000 (15:57 +0200)
Conflicts:
config/rootfiles/core/40/update.sh


Trivial merge