interim update, modified to work against recent changes...

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@palm.com>