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)
commitc1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638
tree70e55d4cdf820e8d84d940d309b5453d189d6952
parent2165fbb2de31272c652055adff8a0665957f58e9
parent38a76ff405f8b1358181c7dfa2e4b23aca1d9985
Merge commit 'origin/master' into next

Conflicts:
config/rootfiles/core/41/filelists/files
src/paks/linux-pae/uninstall.sh