Merge branch 'release/2.1.0' into debian/2.1.0 (at 2.1.0-3)

diff --cc .gitignore
index 6c7e57539af37d8a689299067872a27b17bef8f9,93b03677d97edacb4f085ff1c09136cde7be9a80..3587edeba200a477d828f9ed97b9ab055af13a7f
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,6 @@@
+ *.swp
+ *.class
+ support/sdk/java/net/tinyos/message/SerialPacket.java
+ support/sdk/java/net/tinyos/packet/Serial.java
+ support/sdk/java/net/tinyos/tools/PrintfMsg.java
 +/debian/control