Merge commit 'bc54b6cd239fe6f2a54b2fe2a1739ab58bde19e0' into debian/2.1.0

Conflicts:
	debian/changelog

diff --cc changelog
index 95b32866d571d7b4eb37cb180842d3ba84bbcd54,3b648e932093d3981d2608c541394343f48be5be..9ae1e85b8d1efd5a057ad982fcea8bbf6e0f4632
--- 1/changelog
--- 2/changelog
+++ b/changelog
@@@ -1,5 -1,6 +1,6 @@@
- tinyos (2.1.0-3-1tinyos1) hardy; urgency=low
 -tinyos (2.0.1-2tmi) hardy; urgency=low
++tinyos (2.1.0-3-2tmi) hardy; urgency=low
  
 -  * Package tinyOS upstream release 2.0.1.
 +  * Package TMI release 2.1.0-3, based on official tinyOS release 2.1.0.
+   * Package is now signed.
  
-  -- R. Steve McKown <rsmckown@gmail>  Mon, 07 Dec 2009 11:06:20 -0700
 - -- TMI Packages <pkgs@titaniummirror.com>  Tue, 08 Dec 2009 14:08:03 -0700
++ -- TMI Packages <pkgs@titaniummirror.com>  Tue, 08 Dec 2009 14:57:46 -0700