oss - Revision 6131: /trunk/surf