CHANGES: update with changes from the 'various-things' branch

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

CHANGES

@@ -32,10 +32,10 @@
 	libidn, liblockfile, libpng, libsoup, lighttpd, links,
 	linux-fusion, lmbench, lrzsz, ltrace, make, midori,
 	module-init-tools, mplayer, mysql_client, nbd, ncurses, neon,
-	netcat, netperf, ntfsprogs, openssl, pango, php, qt, quagga,
-	setserial, sdl, sdl_mixer, sdl_sound, sdl_ttf, sqlite,
-	squashfs, swfdec, tftpd, thttpd, tn5250, tremor, usbutils,
-	webif, webkit, wireless_tools, xkeyboard-config,
+	netcat, netperf, netsnmp, ntfsprogs, openssl, pango, php, qt,
+	quagga,	samba, setserial, sdl, sdl_mixer, sdl_sound, sdl_ttf,
+	sqlite,	squashfs, swfdec, tftpd, thttpd, tn5250, tremor,
+	usbutils, webif, webkit, wireless_tools, xkeyboard-config,
 	xserver_xorg-server, xvkbd, zlib
 
 	Removed packages: libgail, modutils, portage, rxvt