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

Merge with main branch.
---

a78ca3c9628b209500205ad77b333bd656175f34