Correct license
Drop cleaned-up code from usit.uio.no svn repository.