grim/guifications3

finally merging the cmake branch into default

2010-12-20, Gary Kramlich
75fc2d82d0e0
finally merging the cmake branch into default