update from the googlecode mirror