[#4481] Fixed merge bug
Signed-off-by: Cory Johns johnsca@geek.net
Authored by: Cory Johns 2012-07-17
Parent(s): [fb67ff]
Child(ren): [99a5a9]