Merge git@github.com:webmin/webmin into warnings2
authorjoe <joe@alice.(none)>
Fri, 11 Sep 2009 17:47:33 +0000 (13:47 -0400)
committerjoe <joe@alice.(none)>
Fri, 11 Sep 2009 17:47:33 +0000 (13:47 -0400)

Trivial merge