Merge branch 'master' into njsf-cov
authorNelson Ferreira <nelson.ferreira@ieee.org>
Mon, 5 Mar 2012 19:33:35 +0000 (14:33 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Mon, 5 Mar 2012 19:33:35 +0000 (14:33 -0500)

Trivial merge