part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)
-rw-r--r-- 31648 CMakeLists.txt
-rw-r--r-- 294 COPYING
-rw-r--r-- 1894 Makefile
-rw-r--r-- 22648 SConstruct
drwxr-xr-x - bin
drwxr-xr-x - build_files
drwxr-xr-x - doc
drwxr-xr-x - extern
drwxr-xr-x - intern
drwxr-xr-x - po
drwxr-xr-x - projectfiles
drwxr-xr-x - projectfiles_vc7
drwxr-xr-x - projectfiles_vc9
drwxr-xr-x - release
drwxr-xr-x - source