Merge branch 'master' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 7 Mar 2012 13:29:21 +0000 (08:29 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 7 Mar 2012 13:29:21 +0000 (08:29 -0500)

Trivial merge