Merge branch 'for-steve' into njsf-cov
authorNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 7 Mar 2012 14:58:51 +0000 (09:58 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 7 Mar 2012 14:58:51 +0000 (09:58 -0500)

Trivial merge