K 10
svn:author
V 3
ian
K 8
svn:date
V 27
2014-12-24T03:09:55.063785Z
K 7
svn:log
V 110
Revert a glitched mismerge that got caught up in the prior commit.
The PJ4B family is still armv7, not armv6.

END