From a0bab0e281fbaf6f6ebbb1a48e5c06426bfbbb93 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sat, 09 Aug 2003 17:29:36 +0000
Subject: Merge from BRANCH_1_0

---
(limited to 'etc')

--
cgit v0.9.0.2