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)
commit81dd3117efce019fc5956143896f1c5d375f55a0
tree8be324e95f0bd0591a44e553bfe0a1888a14be2a
parent0a5d16d2e1625d69fc24f24b843e39fa6a252efc
parent910cd5f620045acaa21e8c765cee64f061947f2b
Merge branch 'for-steve' into njsf-dbus