Merge branch 'master' into tmarble-trng
authorTom Marble <tmarble@info9.net>
Thu, 19 Mar 2015 13:16:00 +0000 (08:16 -0500)
committerTom Marble <tmarble@info9.net>
Thu, 19 Mar 2015 13:16:00 +0000 (08:16 -0500)

Trivial merge