K 10
svn:author
V 2
bz
K 8
svn:date
V 27
2010-12-15T22:58:45.259534Z
K 7
svn:log
V 250
Bring back (most of) NATM to avoid further bitrot after r186119.
Keep three lines disabled which I am unsure if they had been used at all.
This will allow us to seek testers and possibly bring it all back.

Discussed with:	rwatson
MFC after:	7 weeks

END