gustafn
committed
on 30 Aug 14
- get rid of multiple definitions