Merge remote branch 'upstream/master'

author unknown <mgenti@.(none)>

Wed, 10 Mar 2010 21:37:58 +0000 (15:37 -0600)

committer unknown <mgenti@.(none)>

Wed, 10 Mar 2010 21:37:58 +0000 (15:37 -0600)
author unknown <mgenti@.(none)>
Wed, 10 Mar 2010 21:37:58 +0000 (15:37 -0600)
committer unknown <mgenti@.(none)>
Wed, 10 Mar 2010 21:37:58 +0000 (15:37 -0600)
diff --cc tornado/httpserver.py
Simple merge
diff --cc tornado/ioloop.py
Simple merge
diff --cc tornado/web.py
Simple merge
author	unknown <mgenti@.(none)>
	Wed, 10 Mar 2010 21:37:58 +0000 (15:37 -0600)
committer	unknown <mgenti@.(none)>
	Wed, 10 Mar 2010 21:37:58 +0000 (15:37 -0600)
		1	2
tornado/httpserver.py	patch \|	diff1 \|	diff2 \|	blob \| history
tornado/ioloop.py	patch \|	diff1 \|	diff2 \|	blob \| history
tornado/web.py	patch \|	diff1 \|	diff2 \|	blob \| history