Merge branch 'for-steve' into njsf-dbus
authorNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 20 Jan 2012 05:05:18 +0000 (00:05 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 20 Jan 2012 05:05:18 +0000 (00:05 -0500)

Trivial merge