revision 58 from googlecode.