Merge branch 'patches/040_pam-password-prompting' into patches/050_ck_patch
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:01:27 +0000 (23:01 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:01:27 +0000 (23:01 +0000)

Trivial merge