Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 14 Oct 2010 06:33:27 +0000 (08:33 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 14 Oct 2010 06:33:27 +0000 (08:33 +0200)
Conflicts:
config/rootfiles/core/41/filelists/files


Trivial merge