Merge

diff --cc src/win32stubagent/XSAccessor.cpp
Simple merge

diff --cc src/win32stubagent/XService.cpp
index d49d25b81b5c03b175b2b02ff140907acd879a36,b1f572aee422fbf7b938aa1e1c6b3bfb269b3afb..767e24b29b3e205a269b43e26eaaeee99e79ce34
--- 1/src/win32stubagent/XService.cpp
--- 2/src/win32stubagent/XService.cpp
+++ b/src/win32stubagent/XService.cpp
@@@ -741,7 -582,8 +738,10 @@@ BOOL Run(
      }
      XsLog("Guest agent lite main loop starting");
  
+     if (eventLog == NULL)
+         XsLog("Event log was not initialised");
++    
 +    setTimeToXenTime();
  
      memset(&features, 0, sizeof(features));