From d4b64dbd3f047ea86dfbe17e149ed813e4cff6d3 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Tue, 29 Jan 2013 09:00:28 +0000
Subject: Merge branch 'html' of git.sugarlabs.org:/sugar-build/sugar-build into html

---
--
cgit v0.9.1