Merge remote-tracking branch 'tinyos/master'

Update from mainline
Merge branch 'master' of github.com:lab11/tinyos-main

More merging?