merge r349 from branches/jython
merge r349 from branches/jython

sqlalchemy/mako,Distrotech/mako,wujuguang/mako,mindw/mako,wujuguang/mako,zzzeek/mako,sqlalchemy/mako,zzzeek/mako,Distrotech/mako,mindw/mako