Carl Troein - 2012-05-17

Diff against bibo-0.04-ms2