Add another branch to merge from tinyos-main

Now you need my ds2411 branch too.