Merge remote-tracking branch 'origin/master' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 15 Jun 2012 15:16:25 +0000 (11:16 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 15 Jun 2012 15:16:25 +0000 (11:16 -0400)

Trivial merge