Merge branch 'for-steve' into njsf-cov
authorNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 27 Jan 2012 22:47:11 +0000 (17:47 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 27 Jan 2012 22:47:11 +0000 (17:47 -0500)

Trivial merge