Fixes for Ubuntu 10.04

Conflicts:
	src/io/cxx/VideoUtilities.cc