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

Trivial merge