Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --cc doc/packages-list.txt
index 447ffcdc0ac0745eb52e60b43294ee85ea6a1ef0,70e3b96f00a5f028d6c26d7028a74d5fc88c0146..b88f4e3fac1efb00ebba559646007399de6f8f0b
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -68,9 -68,10 +68,10 @@@
  * clamav-0.96.1
  * cmake-2.4.8
  * collectd-4.9.1
 -* compat-wireless-2.6.34-kmod-2.6.32.15-ipfire
 -* compat-wireless-2.6.34-kmod-2.6.32.15-ipfire-xen
 +* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire
 +* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire-xen
  * coreutils-5.96
+ * cpio-2.11
  * cpio-2.6
  * cpufrequtils-007
  * cryptodev-20091126-kmod-2.6.32.15-ipfire