updated to reflect tinyos tree changes