diff --git a/django/conf/admin_templates/admin_change_form.html b/django/conf/admin_templates/admin_change_form.html
index b40e04328c..e585f0e74b 100644
--- a/django/conf/admin_templates/admin_change_form.html
+++ b/django/conf/admin_templates/admin_change_form.html
@@ -23,8 +23,6 @@
 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
 {% if save_on_top %}{% submit_row %}{% endif %}
 {% if form.error_dict %}<p class="errornote">Please correct the error{{ form.error_dict.items|pluralize }} below.</p>{% endif %}
-<b>
-</b>
 {% for bound_field_set in bound_field_sets %}
    <fieldset class="module aligned {{ bound_field_set.classes }}">
     {% if bound_field_set.name %}<h2>{{bound_field_set.name }}</h2>{% endif %}
@@ -46,19 +44,15 @@
    {% endif %}
 {% endif %}
 {% for related_object in inline_related_objects %}{% edit_inline related_object %}{% endfor %}
-
 {% submit_row %}
-
 {% if add %}
    <script type="text/javascript">document.getElementById("{{first_form_field_id}}").focus();</script>
 {% endif %}
-
 {% if auto_populated_fields %}
    <script type="text/javascript">
    {% auto_populated_field_script auto_populated_fields change %} 
    </script>
 {% endif %}
-
 {% if change %}
    {% if ordered_objects %}
       {% if form.order_objects %}<ul id="orderthese">
@@ -69,7 +63,6 @@
 	     {% endfor%}
       {% endif %}
    {% endif %}
-{% endif%}
-</form>
-
-{% endblock %}
+{% endif %}
+</form></div>
+{% endblock %}
\ No newline at end of file
diff --git a/django/core/meta/__init__.py b/django/core/meta/__init__.py
index b59777f3ab..c0ef8d4de0 100644
--- a/django/core/meta/__init__.py
+++ b/django/core/meta/__init__.py
@@ -1610,7 +1610,10 @@ def manipulator_save(opts, klass, add, change, self, new_data):
         if self.follow.get(f.name, None) and not auto_now_add:
             param = f.get_manipulator_new_data(new_data)
         else:
-            param = getattr(self.original_object, f.column)
+            if change:
+                param = getattr(self.original_object, f.column)
+            else:
+                param = f.get_default()
         params[f.column] = param    
     
         # Fields with auto_now_add are another special case; they should keep
diff --git a/django/core/template/__init__.py b/django/core/template/__init__.py
index a5780e4743..0a490a0d33 100644
--- a/django/core/template/__init__.py
+++ b/django/core/template/__init__.py
@@ -247,7 +247,6 @@ class DebugLexer(Lexer):
                         next_linebreak = linebreaks.next()
                         line += 1
                     except StopIteration:
-                        next_linebreak = len(self.template_string)
                         break
             
             token_tups.append( (self.template_string[start:end], line) )
@@ -258,7 +257,6 @@ class DebugLexer(Lexer):
                     next_linebreak = linebreaks.next()
                     line += 1
                 except StopIteration:
-                    next_linebreak = len(self.template_string)
                     break
 
         last_bit = self.template_string[upto:]
diff --git a/django/core/template/decorators.py b/django/core/template/decorators.py
index 3b32e694e7..4da2ea245c 100644
--- a/django/core/template/decorators.py
+++ b/django/core/template/decorators.py
@@ -1,5 +1,5 @@
 from inspect import getargspec
-from django.core import template
+from django.core.template import Context, Node, TemplateSyntaxError, register_tag, resolve_variable
 from django.core.template_loader import render_to_string, get_template
 from django.utils.functional import curry
 
@@ -14,41 +14,41 @@ def gen_compile_func(params, defaults, name, node_class, parser, token):
             message = "%s takes %s arguments" % (name, bmin)
         else:
             message = "%s takes between %s and %s arguments" % (name, bmin, bmax)
-        raise template.TemplateSyntaxError(message)
+        raise TemplateSyntaxError(message)
     return node_class(bits)
 
 
 def simple_tag(func):
     (params,_, _, defaults) = getargspec(func)
-    class TNode(template.Node):
+    class SimpleNode(Node):
         def __init__(self, vars_to_resolve):
             #get the vars to resolve
             self.vars_to_resolve = vars_to_resolve    
 
         def render(self, context):
-            resolved_vars = [template.resolve_variable(var, context) 
+            resolved_vars = [resolve_variable(var, context) 
                               for var in self.vars_to_resolve]
             return func(*resolved_vars)
-    compile_func = curry(gen_compile_func, params, defaults, func.__name__, TNode)
+    compile_func = curry(gen_compile_func, params, defaults, func.__name__, SimpleNode)
     compile_func.__doc__ = func.__doc__
-    template.register_tag(func.__name__, compile_func)
+    register_tag(func.__name__, compile_func)
     return func
 
 
-def inclusion_tag(file_name, context_class=template.Context, takes_context=False):
+def inclusion_tag(file_name, context_class=Context, takes_context=False):
     def dec(func):
         (params,_, _, defaults) = getargspec(func)
         if takes_context:
             if params[0] == 'context':
                 params = params[1:]
             else:
-                raise template.TemplateSyntaxError("Any tag function decorated with takes_context=True must have a first argument of 'context'" )
-        class TNode(template.Node):
+                raise TemplateSyntaxError("Any tag function decorated with takes_context=True must have a first argument of 'context'" )
+        class InclusionNode(Node):
             def __init__(self, vars_to_resolve):
                 self.vars_to_resolve = vars_to_resolve
 
             def render(self, context):
-                resolved_vars = [template.resolve_variable(var, context)
+                resolved_vars = [resolve_variable(var, context)
                                  for var in self.vars_to_resolve]
                 if takes_context:
                     args = [context] + resolved_vars
@@ -62,9 +62,9 @@ def inclusion_tag(file_name, context_class=template.Context, takes_context=False
                     self.nodelist = t.nodelist
                 return self.nodelist.render(context_class(dict))
 
-        compile_func = curry(gen_compile_func, params, defaults, func.__name__, TNode)
+        compile_func = curry(gen_compile_func, params, defaults, func.__name__, InclusionNode)
         compile_func.__doc__ = func.__doc__
-        template.register_tag(func.__name__, compile_func)
+        register_tag(func.__name__, compile_func)
         return func
     return dec