Merge branch 'on-demand-loading'

Fixes #36

diff --combined CMakeLists.txt
index 09bd2c4e429f429c14ab196dd0b57aa7ed8aa89c,e327e28934a1431c7e92d2ba720f9f5112bfc317..9c91c9077313b8ac333d0468b508c94a388102e0
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -187,6 -187,7 +187,7 @@@ add_library (commo
      trace_writer.cpp
      trace_local_writer.cpp
      trace_model_writer.cpp
+     trace_loader.cpp
      image.cpp
      image_bmp.cpp
      image_pnm.cpp
@@@ -204,7 -205,6 +205,6 @@@ link_libraries (common
  add_executable (tracedump tracedump.cpp)
  install (TARGETS tracedump RUNTIME DESTINATION bin) 
  
- 
  ##############################################################################
  # API tracers
  
@@@ -425,14 -425,7 +425,14 @@@ endif (
  ##############################################################################
  # Packaging
  
 -install (FILES LICENSE README.markdown TODO.markdown DESTINATION doc)
 +install (
 +    FILES
 +        BUGS.markdown
 +        LICENSE
 +        NEWS.markdown
 +        README.markdown
 +        TODO.markdown
 +    DESTINATION doc)
  
  set (CPACK_PACKAGE_VERSION_MAJOR "1")
  set (CPACK_PACKAGE_VERSION_MINOR "0")