sphinx: updating code given second release of sphinx 1.2b1-xgen