Merge branch 'master' of git@github.com:webmin/webmin
authorJamie Cameron <jcameron@webmin.com>
Sat, 8 Oct 2011 19:36:03 +0000 (12:36 -0700)
committerJamie Cameron <jcameron@webmin.com>
Sat, 8 Oct 2011 19:36:03 +0000 (12:36 -0700)

Trivial merge