updated CHANGES, setup.py version, and NEWS

CHANGES

@@ -1,4 +1,32 @@
 ------------------------------------------------------------
+revno: 406
+committer: Andrew Psaltis <ampsaltis@gmail.com>
+branch nick: 1.6
+timestamp: Sat 2009-05-30 23:18:22 -0400
+message:
+  Merge r342 of experimental-nacl.
+    ------------------------------------------------------------
+    revno: 202.2.51
+    committer: Andrew Psaltis <ampsaltis@gmail.com>
+    branch nick: experimental-nacl
+    timestamp: Sat 2009-05-30 23:12:53 -0400
+    message:
+      Increased time between wireless scans to 2 seconds.
+    ------------------------------------------------------------
+    revno: 202.2.50
+    committer: Andrew Psaltis <ampsaltis@gmail.com>
+    branch nick: experimental-nacl
+    timestamp: Sat 2009-05-30 23:11:37 -0400
+    message:
+      Merged with r405 of mainline 1.6
+------------------------------------------------------------
+revno: 405
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: 1.6
+timestamp: Thu 2009-05-28 11:10:10 +0800
+message:
+  updated CHANGES and setup.py version
+------------------------------------------------------------
 revno: 404
 committer: Dan O'Reilly <oreilldf@gmail.com>
 branch nick: 1.6

NEWS

@@ -17,7 +17,7 @@ Minor Changes and Other Enhancements:
 - Better autoconnection behavior
 - Tray/GUI will survive the daemon being killed
 - Reasons for connection failures will now bubble back to the GUI
-- Add/Remove wired profile system is now more user-friendly
+- Add/remove wired profile system is now more user-friendly
 - Support for using resolvconf instead of directly editing /etc/resolv.conf
 - Wicd won't blindly kill dhcp clients / wpa_supplicant any more
 - Added an option to automatically switch from a wireless network to a wired 

setup.py

@@ -25,7 +25,7 @@ import subprocess
 
 # Be sure to keep this updated!
 # VERSIONNUMBER
-VERSION_NUM = '1.6.0b3'
+VERSION_NUM = '1.6.0'
 # REVISION_NUM is automatically updated
 REVISION_NUM = 'unknown'
 CURSES_REVNO = 'uimod'