[#1857] More fixes.
Signed-off-by: John Hoffmann jwh@geek.net
Authored by: John Hoffmann 2011-04-14
Committed by: Rick Copeland 2011-04-14
Parent(s): [8ac61a]
Child(ren): [f7b3de]