Merge remote-tracking branch 'origin/master' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Mon, 5 Mar 2012 19:35:38 +0000 (14:35 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Mon, 5 Mar 2012 19:35:38 +0000 (14:35 -0500)

Trivial merge