[python-tempita/f12/master: 6/6] Merge branch 'master' into f12

[Nick Bebout]

commit 3eafc2522987329dc09d45c2ce77b4b445279b14
Merge: 42846fb f5268f9
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Aug 11 22:14:47 2010 -0400

    Merge branch 'master' into f12

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