[nwam-dev] code review for defect 12462

[Alan Maguire]

Seb will retest the suggested fix later (my own
testing indicates all is good so far), but I
wanted to get a webrev out so people could
have a look. See:

http://zhadum.east.sun.com/export/ws/amaguire/nwam1-bugs/webrev/

Thanks!

Alan