import from HEAD:
authorfcusack <fcusack>
Wed, 29 Mar 2006 19:22:00 +0000 (19:22 +0000)
committerfcusack <fcusack>
Wed, 29 Mar 2006 19:22:00 +0000 (19:22 +0000)
add undocumented useauthtok option for PAM


Trivial merge