[python-docutils/f13/master: 4/5] Merge branch 'master' into f13

[Toshio くらとみ]

commit f791ae306eb7d95b5a9ea6cfcc41bdb746cc025e
Merge: c91f164 3a1de6d
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Aug 2 01:11:44 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 python-docutils.spec |   12 +++++++++---
 sources              |    2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)
---