Merge of voight code and bug fixes (no more nan)
Authored by: creigh 2003-04-23
Parent: [r394]
Child: [r396]