Log Message:
Added two patches to make urban compile on NetBSD-1.6.2 with g++-2.95.3.
The compiler doesn't like class members that have the same name as the
class. Approved by wiz.