gis: Merged revisions 7105-7168 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7176 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 0 insertions, 2 deletions

diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py
index e17b821f52..20797c02f6 100644
--- a/django/core/serializers/json.py
+++ b/django/core/serializers/json.py
@@ -4,7 +4,6 @@ Serialize data to/from JSON
 
 import datetime
 from django.utils import simplejson
-from django.utils.simplejson import decoder
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer
 try:
diff --git a/django/core/serializers/pyyaml.py b/django/core/serializers/pyyaml.py
index 4c32a9686f..58cf59bed9 100644
--- a/django/core/serializers/pyyaml.py
+++ b/django/core/serializers/pyyaml.py
@@ -4,7 +4,6 @@ YAML serializer.
 Requires PyYaml (http://pyyaml.org/), but that's checked for in __init__.
 """
 
-import datetime
 from django.db import models
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer