Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 21 Oct 2010 18:43:45 +0000 (20:43 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 21 Oct 2010 18:43:45 +0000 (20:43 +0200)
Conflicts:
config/rootfiles/core/41/filelists/files
src/paks/linux-pae/uninstall.sh


Trivial merge