Fixing errors from commit 2193f1010c0f2ddabfa0cb878996b2de11f2360f
Fixing errors from commit 2193f1010c0f2ddabfa0cb878996b2de11f2360f

MFM:		21 days
Bug-ID:		none
Submitted by:	Stevan Bajic
Security:	none

toddfries/dspam,toddfries/dspam,toddfries/dspam,toddfries/dspam,toddfries/dspam,toddfries/dspam,toddfries/dspam