K 10
svn:author
V 3
pjd
K 8
svn:date
V 27
2012-06-10T13:10:21.461809Z
K 7
svn:log
V 69
Merge two ifs into one. Other minor style fixes.

MFC after:	1 month

END