Merge remote-tracking branch 'myremote/for-steve' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 8 Dec 2013 23:59:15 +0000 (18:59 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 8 Dec 2013 23:59:15 +0000 (18:59 -0500)

Trivial merge