gustafn
committed
on 13 May 09
- improve naming