oss - Revision 1221: /trunk