From: Eirik Nygaard <eirikn@space>
Date: Tue, 3 Apr 2007 17:05:36 +0000 (+0200)
Subject: Merge from main branch.
X-Git-Url: https://git.sesse.net/?p=nms;a=commitdiff_plain;h=5541bedcc39044e899a10f9dc47b755a9b51d503

Merge from main branch.
---

5541bedcc39044e899a10f9dc47b755a9b51d503