Merge branch 'master' of git@github.com:webmin/webmin
authorJamie Cameron <jcameron@webmin.com>
Tue, 28 Jun 2011 16:18:54 +0000 (09:18 -0700)
committerJamie Cameron <jcameron@webmin.com>
Tue, 28 Jun 2011 16:18:54 +0000 (09:18 -0700)

Trivial merge