May 25, 2010 City Council / General Plan Update