Minnor changes
Merge branch 'fuerte-devel' of github.com:srv/srv_tools into fuerte-devel