Merge remote-tracking branch 'remotes/manolinux/645_gmg_adduser_prompt'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 4 Dec 2011 03:43:15 +0000 (21:43 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 4 Dec 2011 03:43:15 +0000 (21:43 -0600)

Trivial merge