Moved changes in from other svn repository
Authored by: jcarey 2006-11-03
Parent: [r377]
Child: [r379]