Merge release into trunk.

diff --git a/apps/tutorials/BlinkConfig/README.txt b/apps/tutorials/BlinkConfig/README.txt
index 7cf9967d15af0c93a3c8d9e33b01456721ba4ba2..cd4301f1eacd8f84f99821d211c53d977ba0751b 100644 (file)
--- a/apps/tutorials/BlinkConfig/README.txt
+++ b/apps/tutorials/BlinkConfig/README.txt
@@ -1,4 +1,5 @@
 $Id$
+
 README for Config
 Author/Contact: tinyos-help@millennium.berkeley.edu
 

diff --git a/tools/release/tinyos.spec b/tools/release/tinyos.spec
index 1d0f92ee1616dc6cb68323afc15563cd2a732859..5526ad25d963a46c91f03331ed6e36baa79bce7a 100644 (file)
--- a/tools/release/tinyos.spec
+++ b/tools/release/tinyos.spec
@@ -1,8 +1,8 @@
 Summary: An event-based operating environment designed for use with embedded networked sensors.
 Name: tinyos
 BuildArchitectures: noarch
-Version: 2.0.0beta2
-Release: 3
+Version: 2.0.0
+Release: 2
 License: Please see source
 Packager: TinyOS Group, UC Berkeley
 Group: Development/System