Merge branch 'master' of git@github.com:webmin/webmin
authorJamie Cameron <jcameron@webmin.com>
Wed, 28 Sep 2011 19:49:44 +0000 (12:49 -0700)
committerJamie Cameron <jcameron@webmin.com>
Wed, 28 Sep 2011 19:49:44 +0000 (12:49 -0700)

Trivial merge