Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Oct 2010 11:34:53 +0000 (13:34 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Oct 2010 11:34:53 +0000 (13:34 +0200)
Conflicts:
src/paks/linux-pae/uninstall.sh


Trivial merge