search for: 380303

I've cherry-picked out the changes from my sphinx branch into an rst only branch for inclusion into 1.2.6. There are two ways you can test this for now: 1. I have a branch on github - https://github.com/dcolish/xapian/tree/rstonly 2. You can apply the attached diff, which is also linked here -> http://paste.pocoo.org/show/397433/ I've looked over the output and it looked okay to me,