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