From: Eirik Nygaard <eirikn@space>
Date: Tue, 3 Apr 2007 15:35:29 +0000 (+0200)
Subject: Merge with main branch
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3ddfa68df44f69c41eb0a27a5702c474725fd7f5;p=nms

Merge with main branch
---

3ddfa68df44f69c41eb0a27a5702c474725fd7f5