[nwam-dev] code review for 13080

[Alan Maguire]

webrev at:

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

Thanks!

Alan