Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x

diff --combined doc/packages-list.txt
index 23569d7af68aea6910cd8b162ecccb95acfd2c29,3d3f21275dd1574221d6a8bc34ddae8b0b915894..9f0acf8b865f5137b7f6da4e1cac76b85c188e11
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -6,7 -6,6 +6,7 @@@
  * Compress-Zlib-1.35
  * Convert-TNEF-0.17
  * Convert-UUlib-1.06
 +* DBI-1.607
  * DFB++-1.0.0
  * Digest-1.08
  * Digest-HMAC-1.01
@@@ -184,7 -183,7 +184,7 @@@
  * lynis-1.2.3
  * lzo-2.02
  * m4-1.4.4
- * mISDNuser-1_1_9
+ * mISDNuser.git-f69adb52764c392135800f9a87c9018f9f268139
  * madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.27.21
  * make-3.81
  * man-db-2.4.3
@@@ -257,7 -256,7 +257,7 @@@
  * rssdler-0.4.0a
  * rsync-3.0.4
  * rtorrent-0.8.4
- * samba-3.3.2
+ * samba-3.3.3
  * sane-1.0.19
  * screen-4.0.3
  * sdparm-1.01