pull-in latest updates made elsewhere
pull-in latest updates made elsewhere

git-svn-id: 335bbb4f426cd3c28bfd587570c39dc43f51688e@62 6314c778-759f-4463-bdf5-253b7e53b7df

cdsi/theoden,cdsi/theoden,cdsi/theoden,cdsi/theoden