r19642@agaton (orig r717): wreis | 2008-06-05 23:01:09 +0100
matthewt [Thu, 24 Jul 2008 01:26:32 +0000 (01:26 +0000)]
 tweaks and cleanup


Trivial merge