K 10 svn:author V 2 ed K 8 svn:date V 27 2010-11-04T18:24:05.077800Z K 7 svn:log V 60 Merge from HEAD, so I can make universe, create diffs, etc. END