From 61edb0f742604cd3cc2dc9895cf679765b9b899e Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Mon, 09 Nov 2009 03:10:11 +0000
Subject: Merge branch 'lp435984' of ../mainline

Conflicts:
	addons/gtkwidgeteventfilter.py
	addons/readfile.py
	addons/timerevent.py
	tests/probetests.py
	tests/run-tests.py
	tutorius/TProbe.py
	tutorius/bundler.py
	tutorius/core.py
	tutorius/creator.py
	tutorius/dbustools.py
	tutorius/engine.py
	tutorius/filters.py
	tutorius/properties.py
	tutorius/service.py
---
(limited to 'tutorius/tutorial.py')

--
cgit v0.9.1