Merge remote-tracking branch 'tom/master'

Conflicts:
	rest_framework/tests/serializer.py

1 files changed, 2 insertions, 1 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index d3470854..398d473f 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -390,6 +390,7 @@ class ManyRelatedMixin(object):
         else:
             if value == ['']:
                 value = []
+
         into[field_name] = [self.from_native(item) for item in value]
 
 
@@ -801,7 +802,7 @@ class ChoiceField(WritableField):
                     if value == smart_unicode(k2):
                         return True
             else:
-                if value == smart_unicode(k):
+                if value == smart_unicode(k) or value == k:
                     return True
         return False