Fixed incorrect output messages and exit codes
Authored by: cerbum 2011-09-23
Parent: [r90]
Child: [r92]