Merge remote-tracking branch 'singu/master'

Conflicts:
	indra/cmake/WebKitLibPlugin.cmake
	indra/llmessage/llurlrequest.cpp
	indra/plugins/webkit/media_plugin_webkit.cpp

indra/plugins/webkit/media_plugin_webkit.cpp

@@ -25,8 +25,10 @@
  * $/LicenseInfo$
  * @endcond
  */
-#include "llqtwebkit.h"
 #include "linden_common.h"
+
+#include "llqtwebkit.h"
+
 #include "indra_constants.h" // for indra keyboard codes
 
 #include "lltimer.h"
@@ -160,7 +162,7 @@ private:
 		mVolumeCatcher.pump();
 
 		checkEditState();
-		
+	
 		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
 		{
 			if(!mInitialNavigateURL.empty())