Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Aug 2010 19:40:55 +0000 (21:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Aug 2010 19:40:55 +0000 (21:40 +0200)
Conflicts:
config/rootfiles/core/40/filelists/files

1  2 
config/rootfiles/common/initscripts

Simple merge