Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 5 Sep 2010 12:32:42 +0000 (14:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 5 Sep 2010 12:32:42 +0000 (14:32 +0200)
commitd7534b193e43ef5de7602b5dc7070f8ab4212554
tree9399097d212a735f5ae801acb6cb2a0583895576
parent6a0328658a0a3ca9b9bcdb95aedc427ebd5196ae
parentd482af1005aa3ed1b81d85798229866459f3f9d0
Merge branch 'master' into next

Conflicts:
config/rootfiles/core/40/exclude
config/rootfiles/core/40/filelists/files
config/rootfiles/core/40/update.sh
make.sh
doc/packages-list.txt
make.sh