Bug 1006741 - Increase timeout when preparing gallery test;r=davehunt
Bug 1007233 - Update for Ubuntu 14.04 LTS. r=wlachance