Hotfixes from nightly for Ubuntu 10.04 and SLES (Issues #177)