Index: django/views/decorators/http.py
===================================================================
--- django/views/decorators/http.py	(revision 10116)
+++ django/views/decorators/http.py	(working copy)
@@ -128,8 +128,8 @@
 
 # Shortcut decorators for common cases based on ETag or Last-Modified only
 def etag(callable):
-    return condition(etag=callable)
+    return condition(etag_func=callable)
 
 def last_modified(callable):
-    return condition(last_modified=callable)
+    return condition(last_modified_func=callable)