svn path=/branches/condrv_restructure/; revision=63285
svn path=/branches/condrv_restructure/; revision=63104