[python-tempita/el5/master: 13/13] Merge branch 'master' into el5

[Nick Bebout]

commit ed30b4358a2c25702da603bb52bb027eef9cf345
Merge: 644c9f8 f5268f9
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Aug 11 22:16:33 2010 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

 python-tempita-0.2-fix-tests.patch |   11 ----
 python-tempita.spec                |  102 ++++++++++++++++++++++++++++++++----
 sources                            |    2 +-
 tempita-py3-compat.diff            |   24 ++++++++
 4 files changed, 116 insertions(+), 23 deletions(-)
---