Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 14 Oct 2010 06:33:27 +0000 (08:33 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 14 Oct 2010 06:33:27 +0000 (08:33 +0200)
commit799cc0f3a9524abbbd6cca803795206e2112a00e
treeb8b7c3a0557666a68b9e0162839096d174d105b5
parentd4c6ba21eb1aed558c60f5a30a4de028f06584c0
parent4c4a3475521a5a3196d180a2af626c5e2d7846b0
Merge commit 'origin/master' into next

Conflicts:
config/rootfiles/core/41/filelists/files