Merge commit 'v1.1.1'

Conflicts:
	setup.py

diff --cc setup.py
index 5645ff3fbf6714f5b91468c96a6640a2ce6e5586,59e4690234266f7f1358b5ced822ed4b69ed46f1..ebff637492504a63296917de143f8f957c538502
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -31,15 -31,10 +31,15 @@@ if "linux" in sys.platform.lower() and 
      extensions.append(distutils.core.Extension(
          "tornado.epoll", ["tornado/epoll.c"]))
  
- version = "1.1"
++version = "1.1.1"
 +
  distutils.core.setup(
      name="tornado",
 -    version="1.1.1",
 -    packages = ["tornado"],
 +    version=version,
 +    packages = ["tornado", "tornado.test"],
 +    package_data = {
 +        "tornado.test": ["README", "test.crt", "test.key"],
 +        },
      ext_modules = extensions,
      author="Facebook",
      author_email="python-tornado@googlegroups.com",

diff --cc tornado/web.py
Simple merge

diff --cc website/templates/documentation.txt
Simple merge

diff --cc website/templates/index.html
Simple merge