From: root <root@space>
Date: Tue, 3 Apr 2007 21:03:59 +0000 (+0200)
Subject: Merge with eirikns branch.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e295b7fe35047f6ce95b26b57dfdfa0931716c45;p=nms

Merge with eirikns branch.
---

e295b7fe35047f6ce95b26b57dfdfa0931716c45