Patch build for Ubuntu 10.04 - already on upstream