Initial checkin from svn/trunk google code rev 470, stable 1.1.1