From 4c41576c95648cc5741cabc3acb5d9f0bb8b11fc Mon Sep 17 00:00:00 2001
From: Simon Poirier <simpoir@Eridani.(none)>
Date: Fri, 18 Sep 2009 15:49:43 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:tutorius/mainline

Conflicts:
	setup.py
	toolkitfix/__init__.py
---
(limited to 'toolkitfix/__init__.py')

diff --git a/toolkitfix/__init__.py b/toolkitfix/__init__.py
deleted file mode 100644
index e915b38..0000000
--- a/toolkitfix/__init__.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2006-2007, Red Hat, Inc.
-# Copyright (C) 2007-2008, One Laptop Per Child
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-import os
-import gettext
-
-if os.environ.has_key('SUGAR_PREFIX'):
-    prefix = os.environ['SUGAR_PREFIX']
-else:
-    prefix = '/usr'
-
-locale_path = os.path.join(prefix, 'share', 'locale')
-
-gettext.bindtextdomain('sugar-base', locale_path)
-
--
cgit v0.9.1