Merge branch 'dirk'
fix VS2008 build error