From 1c58d1407f9584fedcdae390a04e2b37e5853361 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sat, 09 Aug 2003 16:12:19 +0000
Subject: Merge from BRANCH_1_0

---
(limited to 'etc')

--
cgit v0.9.0.2