From 6fa568daae3291c7a876cd903f04079a12945dcb Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Tue, 05 May 2009 05:44:27 +0000
Subject: Merge branch 'mike'

Conflicts:
	source/external/source/sugar-toolkit/src/sugar/tutorius/actions.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
---
(limited to 'src/sugar/tutorius/linear_creator.py')

--
cgit v0.9.1