[python-sphinx10/el6/master: 3/3] Merge branch 'el5' into el6

[Michel Alexandre Salim]

commit 064ce007ce805067d6afc9d199fb10165ded9e9b
Merge: 643435c 9bcfe33
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Mar 13 15:10:04 2011 +0100

    Merge branch 'el5' into el6
    
    Conflicts:
    	sources

 .gitignore                    |    1 +
 README.Fedora                 |   20 ++++
 Sphinx-1.0.4-localedirs.patch |   22 +++++
 python-sphinx10.spec          |  206 +++++++++++++++++++++++++++++++++++++++++
 sources                       |    1 +
 5 files changed, 250 insertions(+), 0 deletions(-)
---