Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 29 Aug 2010 10:59:53 +0000 (12:59 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 29 Aug 2010 10:59:53 +0000 (12:59 +0200)
commitb6af41a572eb83e73875b1f8d450405fbee8eb0a
treed12033550f5eb1c11bddbca9746741acec2f2225
parent1d9242b1b0942938aadbe630b11bd040637cd1ea
parent4d17a269dbd948f6c48f561552c328ab52b085ec
Merge branch 'master' into next

Conflicts:
config/rootfiles/core/40/filelists/files
make.sh
config/rootfiles/common/initscripts
doc/packages-list.txt
lfs/initscripts
make.sh