git-svn-id: svn://10.0.0.236/trunk@111137 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@110722 18797224-902f-48f8-a5cc-f745e15eee43
Merging CCK_IB_BRANCH into trunk reviewed by smeredith@netscape.com, shrutiv@netscape.com git-svn-id: svn://10.0.0.236/trunk@110652 18797224-902f-48f8-a5cc-f745e15eee43