Bjoern A. Zeeb 8c9cef57ac 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
2010-12-15 22:58:45 +00:00
..
2010-09-02 17:43:44 +00:00
2010-11-09 10:59:09 +00:00