From 8e10e04c59614cc9bbca90b4c2abb73d3f47618e Mon Sep 17 00:00:00 2001
From: Vincent Vinet <vince.vinet@gmail.com>
Date: Thu, 01 Oct 2009 15:28:26 +0000
Subject: Merge branch 'lp429661' of git://git.sugarlabs.org/tutorius/mainline into lp429661

---
--
cgit v0.9.1