Commit changes via email from Jon Scott 2012-11-07

Commit changes received via email from Jon Scott 2012-11-07.

Signed-off-by: Jeff Godin <jgodin@tadl.org>