merge safemode branch -r12656, merge mucking fixed. vegaserver compiles again. also, not sure how the mesher cmake setup got lost but it's back
Authored by: safemode 2010-02-27
Parent: [r12656]
Child: [r12658]