Merge branch 'SE1' of ssh://github.com/svic/mozilla-central into SE

Conflicts:
	dom/base/nsDOMClassInfoClasses.h
	dom/network/interfaces/nsIMobileConnectionProvider.idl
	dom/nfc/nsIDOMNavigatorNfc.idl
	dom/telephony/Telephony.cpp
	dom/telephony/nsIDOMTelephony.idl
	layout/build/nsLayoutModule.cpp
Merge branch 'SE1' of ssh://github.com/svic/mozilla-central into SE

Conflicts:
	dom/base/nsDOMClassInfoClasses.h