revision 85 from googlecode