Merge remote-tracking branch 'njsf/for-steve' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sat, 3 Mar 2012 05:33:54 +0000 (00:33 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sat, 3 Mar 2012 05:33:54 +0000 (00:33 -0500)

Trivial merge