From 87c33a7fdbf08f564e5a76f035883cfbfc468772 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@sugarlabs.org>
Date: Sat, 24 Sep 2011 14:34:17 +0000
Subject: Merge commit 'de9c8a60b0e79d0e5e5837bd80082b58e1ec5404' into tmp

---
--
cgit v0.9.1