merge branches/lazyeugene

git-svn-id: https://colorer.svn.sourceforge.net/svnroot/colorer/trunk@1900 0bd3b267-ae0d-0410-aca8-b41e4d3634ba