From 658692ec90438dd5c43a49732b476009d0ff10e8 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Tue, 11 Jan 2011 18:43:24 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-base/mainline

---
--
cgit v0.9.1