From fd87de118d519108b99125f190f3aa6bd2a0b4cb Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Mon, 03 Nov 2003 18:37:25 +0000
Subject: resolve merge conflict

---
(limited to 'noncore/settings')

--
cgit v0.9.0.2