Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Oct 2010 18:17:15 +0000 (20:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Oct 2010 18:17:15 +0000 (20:17 +0200)
commit38c982bb77390f53744815eedb877ebeab05ba4b
tree56126584f303842887fdcbcdf25f01f7a6524c9c
parentc1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638
parentcfac7c232c136363dad5b451549394d996cef1b2
Merge commit 'origin/master' into next

Conflicts:
src/paks/linux-pae/uninstall.sh
make.sh