From: root <root@space>
Date: Sat, 7 Apr 2007 16:30:09 +0000 (+0200)
Subject: Merge.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;p=nms

Merge.
---

cc0b9f43fe25834abfa41bb3bf57306865a608f8