Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 20 Oct 2010 16:18:34 +0000 (18:18 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 20 Oct 2010 16:18:34 +0000 (18:18 +0200)
Conflicts:
config/rootfiles/core/41/exclude
config/rootfiles/core/41/filelists/files


Trivial merge