SVN revision: 56257
SVN revision: 48213
Spec and build fixes. ---------------------------------------------------------------------- SVN revision: 32416