Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 11 Aug 2010 16:08:51 +0000 (18:08 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 11 Aug 2010 16:08:51 +0000 (18:08 +0200)
commit99555458ad1defb46fa59fb7a7f7ce52001d0ff4
tree62d6954893497adb754c98613e8a7fa44e51fd54
parent6cf9e77034bd4b27932e806a70e9b6985216a913
parent9f3e557b55cb8c8fd62cffad457eb346492a79fd
Merge branch 'master' into next

Conflicts:
config/rootfiles/core/40/filelists/compat-wireless
config/rootfiles/core/40/filelists/files
doc/packages-list.txt
config/kernel/kernel.config.i586-ipfire
config/rootfiles/core/40/exclude
config/rootfiles/core/40/filelists/files
config/rootfiles/core/40/filelists/python
config/rootfiles/core/40/meta
config/rootfiles/core/40/update.sh
doc/packages-list.txt