Merge branch 'patches/030_fix-if-else' into patches/040_pam-password-prompting
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:00:18 +0000 (23:00 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:00:18 +0000 (23:00 +0000)

Trivial merge