From ec14206f63dd93e9fb84c76cbc76fc1968637590 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sat, 09 Aug 2003 17:38:23 +0000
Subject: Merge from BRANCH_1_0

---
(limited to 'mkipks')

--
cgit v0.9.0.2