From 8dc71d4826633fba63618a509e84ca4a30f5addb Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Tue, 04 Nov 2003 17:09:54 +0000
Subject: resolved merge conflict (hopefully)

---
(limited to 'x11')

--
cgit v0.9.0.2