Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 18 Aug 2010 19:54:42 +0000 (21:54 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 18 Aug 2010 19:54:42 +0000 (21:54 +0200)
commit908719c955c7af7752ee09bcb6a79d2a3919a22e
tree955827da4eef420dc79dbfbabd158c8197b78ce4
parent3cbeb8c7a14843ea43695efa6bf02cceb2579ba5
parent8190e95105d0398862f0be73b6b4e4fbd8b27214
Merge branch 'master' into next

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