Merge branch 'master' of https://code.google.com/p/protobuf-dt/ into
option-ref

Conflicts:
	com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor.java