Integrated internal changes from Google

This includes all internal changes from around May 20 to now.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h
index a4d9277e..dcdffe1c 100644
--- a/src/google/protobuf/message.h
+++ b/src/google/protobuf/message.h
@@ -585,8 +585,8 @@ class LIBPROTOBUF_EXPORT Reflection {
   // If you have no idea what that meant, then you probably don't need to worry
   // about it (don't provide a MessageFactory).  WARNING:  If the
   // FieldDescriptor is for a compiled-in extension, then
-  // factory->GetPrototype(field->message_type() MUST return an instance of the
-  // compiled-in class for this type, NOT DynamicMessage.
+  // factory->GetPrototype(field->message_type()) MUST return an instance of
+  // the compiled-in class for this type, NOT DynamicMessage.
   virtual Message* MutableMessage(Message* message,
                                   const FieldDescriptor* field,
                                   MessageFactory* factory = NULL) const = 0;