Merge remote-tracking branch 'njsf/for-steve' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 14 Mar 2012 00:42:27 +0000 (20:42 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 14 Mar 2012 00:42:27 +0000 (20:42 -0400)

Trivial merge