2009-05-26Various fixes and simplifications
insilmaril [Tue, 26 May 2009 11:23:44 +0000] rev 773
Various fixes and simplifications