Tiny changes that got lost in the merge
Tiny changes that got lost in the merge

git-svn-id: 090da6488605dfa80d897e2ab24bbff42289b741@23 c014309e-2312-11df-8901-e16673284e38

raphlinus/ghilbert,jkingdon/ghilbert,kryptine/ghilbert,jkingdon/ghilbert,kryptine/ghilbert,raphlinus/ghilbert,raphlinus/ghilbert,raphlinus/ghilbert