[sphinxbase/f13/master: 4/7] Merge branch 'master' into f13

[Jerry James]

commit f814284b8292befc9e40e81bee3f66c29df9e131
Merge: c0a64bd 5f9079d
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Aug 16 14:24:42 2010 -0600

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 sources                                            |    2 +-
 ...1-python.patch => sphinxbase-0.6.1-python.patch |   11 ++--
 sphinxbase.spec                                    |   56 ++++++++++++--------
 3 files changed, 40 insertions(+), 29 deletions(-)
---