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 'tutorius')

--
cgit v0.9.1