sync with googlecode r240. fixbug