[python26-tornado/el5: 18/31] Merge branch 'master' into el6

[gholms]

commit 1d01dc3e0571cd3337c9c39699c1f92a2d114e73
Merge: ba94a7c 8996172
Author: Ionuț C. Arțăriși <iartarisi at suse.cz>
Date:   Wed Mar 30 14:22:34 2011 +0200

    Merge branch 'master' into el6

 .gitignore          |    1 +
 python-tornado.spec |    8 +++++++-
 sources             |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---