Merge remote-tracking branch 'njsf/for-steve' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 7 Mar 2012 16:20:23 +0000 (11:20 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 7 Mar 2012 16:20:23 +0000 (11:20 -0500)

Trivial merge