* fixed problem with test building on amd64 host
Merge branch 'master' of github.com:ponyatov/ossau

Conflicts:
	configs/ossau.config