Merge branch 'devel' of git://uglyman.kremlin.cc/git/systembsd into devel
authorkremlin <ian@kremlin.cc>
Mon, 25 Aug 2014 19:57:22 +0000 (14:57 -0500)
committerkremlin <ian@kremlin.cc>
Mon, 25 Aug 2014 19:57:22 +0000 (14:57 -0500)

Trivial merge