[python-tornado/f14/master: 7/7] merged with master for 1.2.1

[Ionuț Arțăriși]

commit f49ea890da97c4f83b7a04ba0c23e9aea054f6b2
Merge: 0b54c3b 8996172
Author: Ionuț C. Arțăriși <iartarisi at suse.cz>
Date:   Wed Mar 30 13:44:03 2011 +0200

    merged with master for 1.2.1

 .gitignore          |    5 +----
 python-tornado.spec |    8 +++++++-
 sources             |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 2a25fd3,1d33e16..e86a5e4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,5 +1,1 @@@
--tornado-0.2.tar.gz
--tornado-1.0.tar.gz
--tornado-1.0.1.tar.gz
--/tornado-1.1.tar.gz
 -/tornado-1.2.1.tar.gz
++/tornado-1.2.1.tar.gz
diff --cc sources
index 4508c0c,2208a5d..30b4a5f
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,1 @@@
- dd6914d09b258545bd138763c16c6c1f  tornado-1.1.tar.gz
 -e2bfb4e0d97e79101dfb0832d76f9e2b  tornado-1.2.1.tar.gz
++e2bfb4e0d97e79101dfb0832d76f9e2b  tornado-1.2.1.tar.gz