Touchups.
Merge branch 'master' of ssh://github/da99/www_applet