Builds cleanly and executes but no run-time testing as yet - beware. svn path=/trunk/; revision=3436
svn path=/trunk/; revision=3219