merging OBJS11 back to trunk
Authored by: svnadmin@icandy.homeunix.org 2003-11-30
Parent: [r1092]
Child: [r1094]