Merge remote-tracking branch 'origin/master' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 22 Feb 2012 21:52:45 +0000 (16:52 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 22 Feb 2012 21:52:45 +0000 (16:52 -0500)

Trivial merge