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)
commit8caf7b64c83ea3641ee66a1e5b35d965ce78f666
treed582cfacdfa7230d92e99bdc6a1c99567eb99fa9
parenta398cc21e909a60e582ee65887e17f66e22d3d29
parent889a288b3639ec726f28b39022a42d38532e18e7
Merge commit 'origin/master' into next

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