From 70b04042d2521f99171ca3bdad98eb97ac34752c Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Fri, 18 Jan 2008 20:03:13 +0000
Subject: Merge branch 'update-1' of git+ssh://dev.laptop.org/git/sugar into update-1

---
diff --git a/shell/controlpanel/control.py b/shell/controlpanel/control.py
index 793d444..793d444 100755..100644
--- a/shell/controlpanel/control.py
+++ b/shell/controlpanel/control.py
--
cgit v0.9.1