Signed-off-by: Tim Harvey <tharvey@gateworks.com> SVN-Revision: 33720
Compile tested only. SVN-Revision: 31809