From: root <root@space>
Date: Tue, 3 Apr 2007 16:46:20 +0000 (+0200)
Subject: Merge.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8c3c9e3b907b47ea0aa1f89d75d80d618fde9e95;p=nms

Merge.
---

8c3c9e3b907b47ea0aa1f89d75d80d618fde9e95