after Lucid ubuntu upgrade

[http://dummy.us.eu.org/robert (Robert)]

get update_laptop to work
*deal with /dev/sda6/etc/network -> /etc/network
*deal with /etc/pulse/default.pa*
*deal with /etc/mplayer/mplayer.conf*
*deal with /etc/modprobe.d/alsa-base.conf*
*get email working
*deal with /etc/pulse/client.conf*
*resolve /home/home.old/etc/firestarter with /etc/firestarter
*add bluez-gnome back
*get printer working
*deal with /dev/sda6/etc/printcap -> /etc/printcap
*deal with /dev/sda6/etc/cups -> /etc/cups
*deal with /etc/cron.daily/apt*
*deal with /etc/apt/apt.conf.d/50unattended-upgrades*
*deal with /etc/tinyproxy/tinyproxy.conf
*deal with /etc/privoxy/config*
*edit /etc/update-manager/release* so it is "lts"
*resolve /dev/sda6/etc/apt with /etc/apt
*deal with /etc/cups/cupsd.conf*
*add back
*  language-support-en{a} language-support-writing-en myspell-en-gb 
*  myspell-en-za openoffice.org-thesaurus-en-au 
*  openoffice.org-thesaurus-en-us 
*get tabs working in mrxvt
*get xtightvncviewer working
*restore /usr/local from /home/home.old/local
*restore /home/robert from /home/home.old/robert
*combine /etc/apt/sources.list.lucid-karmic with /etc/apt/sources.list so has extra repositories
*run "software-properties" to restore third-party software
*get getty terminal windows working