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

diff --combined doc/packages-list.txt
index b1d12db423eb1159769952657881942cd343653b,4b516cecc4099a14f6779af701a235975db7df57..7fdb7540b769ba40015bcf18f05a049295e5cc51
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -84,6 -84,7 +84,7 @@@
  * dahdi-2.2.1-kmod-2.6.32.15-ipfire-xen
  * db-4.4.20
  * dbus-1.0.3
+ * ddrescue-1.12
  * dhcp-3.1.0
  * dhcpcd-5.1.3
  * diffutils-2.8.1
@@@ -224,6 -225,7 +225,7 @@@
  * mediatomb-svn2020
  * memtest86+-4.10
  * miau-0.6.5
+ * minicom-2.4
  * misc-progs
  * mkinitcpio-0.5.9
  * mktemp-1.5
@@@ -276,7 -278,7 +278,7 @@@
  * popt-1.10.4
  * portmap_6.0
  * postfix-2.6.5
- * ppp-2.4.4
+ * ppp-2.4.5
  * pptp-1.7.2
  * procps-3.2.6
  * psmisc-22.2
@@@ -291,7 -293,6 +293,6 @@@
  * readline-5.1
  * reiser4progs-1.0.6
  * reiserfsprogs-3.6.21
- * rp-pppoe-3.8
  * rrdtool-1.2.30
  * rssdler-0.4.0a
  * rsync-3.0.7
@@@ -346,7 -347,7 +347,7 @@@
  * v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire
  * v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen
  * vdr-1.6.0
 -* vdradmin-am-3.6.5
 +* vdradmin-am-3.6.7
  * vim-7.0
  * vlan.1.9
  * vlc-0.8.6i
@@@ -354,7 -355,7 +355,7 @@@
  * vnstati-beta3
  * vsftpd-2.1.2
  * w_scan-20080105
- * watchdog-5.6
+ * watchdog-5.9
  * wget-1.10.2
  * whatmask-1.2
  * which-2.16