Merge commit 'origin/core43'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 3 Dec 2010 17:56:37 +0000 (18:56 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 3 Dec 2010 17:56:37 +0000 (18:56 +0100)
commit51cac9a1ce8b4baa0a214f7674d8a915a8030560
tree98ca0f4852ae8bd9fcd1c5d314b37682cdb15006
parent473725f5b006ecfb13d08c17e03ef8c5c0d66b3a
parent20651e22d4df1e8c5f38a1be63d3fb3826c27dcc
Merge commit 'origin/core43'

Conflicts:
lfs/openssl
make.sh
config/rootfiles/oldcore/42/exclude
make.sh