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)
Conflicts:
config/rootfiles/core/40/filelists/files
config/rootfiles/core/40/update.sh

1  2 
doc/packages-list.txt

  * ccache-3.0pre0
  * cdrtools-2.01.01
  * centerim-4.22.1
- * clamav-0.96.1
+ * clamav-0.96.2
  * cmake-2.4.8
  * collectd-4.9.1
 -* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire
 -* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire-xen
 +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire
 +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire-xen
  * coreutils-5.96
  * cpio-2.11
  * cpufrequtils-007