revision 95 from google code.