From e784a2f0b92ecaf46a77ddca94b31fcc86e0cbae Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Fri, 17 Apr 2009 04:36:31 +0000
Subject: Merge branch 'jc_support' into mike

Conflicts:

	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/coretests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
---
(limited to 'src/sugar/presence')

--
cgit v0.9.1