From 7737720aa816cee3155ccd4762772e06a1d0188c Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 23 Jan 2010 16:35:57 +0100
Subject: [PATCH] Conflicts:

	pyfpdb/Charset.py
---
 pyfpdb/Charset.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index f8043876..69511cdd 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -33,8 +33,7 @@ def to_utf8(s):
     if not_needed: return s
 
     try:
-        #(_out, _len) = encoder_to_utf.encode(s)
-        _out = unicode(s, Configuration.LOCALE_ENCODING).encode('utf-8')
+        (_out, _len) = encoder_to_utf.encode(s)
         return _out
     except UnicodeDecodeError:
         print 'Could not convert: "%s"' % s