gustafn
committed
on 08 Jul 10
- make import more robust