From ccea7e99b37feb179d3f74ec28200e93fca6d8b2 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sat, 09 Aug 2003 18:04:45 +0000
Subject: Merge from BRANCH_1_0

---
(limited to 'pics/confedit')

--
cgit v0.9.0.2