Bug#203741: Authentication patch brought up to date

[Matt Zimmerman]

Thanks to Michael Vogt and Canonical, the authentication patch has been
now brought up to date with mainline, and merges cleanly again.

-- 
 - mdz