gustafn
committed
on 28 Jun 10
- move code around