From 9267c0cdf182a0f309f8b4e53f506a3b67f637ae Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Fri, 27 Jan 2012 13:28:03 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline

---
--
cgit v0.9.1