From 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Mon, 03 Nov 2003 17:56:32 +0000
Subject: resolved merge conflict

---
(limited to 'i18n')

--
cgit v0.9.0.2