--- a/web/lib/django/contrib/localflavor/au/forms.py	Wed May 19 17:43:59 2010 +0200
+++ b/web/lib/django/contrib/localflavor/au/forms.py	Tue May 25 02:43:45 2010 +0200
@@ -2,9 +2,10 @@
 Australian-specific Form helpers
 """
 
+from django.core.validators import EMPTY_VALUES
 from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES
-from django.forms.util import smart_unicode
+from django.forms.fields import Field, RegexField, Select
+from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext_lazy as _
 import re