Merge remote-tracking branch 'jbenton/master'

diff --combined CMakeLists.txt
index 3970f05c71d56edd3126165efc75119e23880c37,a7cbf20325baad496c6c18362848f8028004a71b..9fe20026c6e438be1778bd8fff0bf6e64d591f57
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -70,7 -70,7 +70,7 @@@ include (CheckCXXCompilerFlag
  
  if (WIN32)
      # http://msdn.microsoft.com/en-us/library/aa383745.aspx
 -    add_definitions (-D_WIN32_WINNT=0x0501 -DWINVER=0x0501)
 +    add_definitions (-D_WIN32_WINNT=0x0601 -DWINVER=0x0601)
  else (WIN32)
      CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" CXX_COMPILER_FLAG_VISIBILITY)
      if (CXX_COMPILER_FLAG_VISIBILITY)
@@@ -295,6 -295,7 +295,7 @@@ add_library (common STATI
      common/trace_loader.cpp
      common/trace_resource.cpp
      common/trace_tools_trace.cpp
+     common/trace_profiler.cpp
      common/image.cpp
      common/image_bmp.cpp
      common/image_pnm.cpp