Merge branch 'master' into next

Conflicts:
	doc/packages-list.txt

diff --cc doc/packages-list.txt
index b21bce4e68afb9e0f5190beb4ae7ddafbacc632a,fd04405fee9a0907cd66c530544c848c1fe76c29..ee2467a661e60ca899b2f48244b6bad73ef661e8
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -72,9 -73,9 +72,9 @@@
  * coreutils-5.96
  * cpio-2.11
  * cpufrequtils-007
 -* cryptodev-20091126-kmod-2.6.32.15-ipfire
 -* cryptodev-20091126-kmod-2.6.32.15-ipfire-xen
 +* cryptodev-20091126-kmod-2.6.32.21-ipfire
 +* cryptodev-20091126-kmod-2.6.32.21-ipfire-xen
- * cups-1.4.2
+ * cups-1.4.4
  * curl-7.19.5
  * cyrus-imapd-2.2.12
  * cyrus-sasl-2.1.21
@@@ -138,9 -138,9 +138,9 @@@
  * gzip-1.3.5
  * hddtemp-0.3-beta14
  * hdparm-8.9
 -* hostapd-0.7.2
 +* hostapd-0.7.3
  * hplip-2.7.10
- * htop-0.8.1
+ * htop-0.8.3
  * httpd-2.2.15
  * hwdata
  * iana-etc-2.10