merge 3.3 (#20110)

benjaminp · benjaminp · commit 8ec15f7a924a · 2014-01-02T16:48:24.000-06:00
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
@@ -495,7 +495,7 @@ Callable types
       | :attr:`__annotations__` | A dict containing annotations | Writable  |
       |                         | of parameters.  The keys of   |           |
       |                         | the dict are the parameter    |           |
-      |                         | names, or ``'return'`` for    |           |
+      |                         | names, and ``'return'`` for   |           |
       |                         | the return annotation, if     |           |
       |                         | provided.                     |           |
       +-------------------------+-------------------------------+-----------+
