Merge branch 'master' of git@github.com:webmin/webmin
authorJamie Cameron <jcameron@webmin.com>
Sat, 22 Oct 2011 17:26:01 +0000 (10:26 -0700)
committerJamie Cameron <jcameron@webmin.com>
Sat, 22 Oct 2011 17:26:01 +0000 (10:26 -0700)

Trivial merge