[#3967] Fixed issue from merge
Signed-off-by: Cory Johns johnsca@geek.net
Authored by: Cory Johns 2012-08-15
Parent(s): [a67161]
Child(ren): [ac071d]