From: kremlin- <ian@kremlin.cc>
Date: Thu, 26 Jun 2014 02:06:06 +0000 (-0500)
Subject: fixing merge conflicts
X-Git-Tag: hostnamed-copyable~16
X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=94304e786b09589046e9ac4e38e2dffca29564b4;hp=94304e786b09589046e9ac4e38e2dffca29564b4;p=systembsd.git

fixing merge conflicts
---