K 10 svn:author V 8 jpaetzel K 8 svn:date V 27 2011-01-25T13:41:48.056898Z K 7 svn:log V 162 Fix logic error introduced in previous commit. Along the way make some efficiency improvements. Submitted by: jilles Approved by: kib (mentor) MFC after: 3 days END