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

[Nick Bebout]

commit 3b072ae4e4b8a21e9411142b7fa0caa9b79d3dfc
Merge: 2ce9321 f5268f9
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Aug 11 22:13:18 2010 -0400

    Merge branch 'master' into f13

 python-tempita.spec     |   73 +++++++++++++++++++++++++++++++++++++++++++++--
 tempita-py3-compat.diff |   24 +++++++++++++++
 2 files changed, 94 insertions(+), 3 deletions(-)
---