From: root <root@space>
Date: Tue, 3 Apr 2007 17:59:01 +0000 (+0200)
Subject: Merge.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a1804b2827481eb0fd4f914728fa293ba0fa5dca;hp=a1804b2827481eb0fd4f914728fa293ba0fa5dca;p=nms

Merge.
---