torbenb
committed
on 26 Mar 11
more bug fixes, and reducing inconsistencies