From f95bb78a8900ad5823aae9a6e62a76b5fc0c77bd Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Fri, 19 Jan 2007 14:48:09 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
diff --git a/shell/view/Makefile.am b/shell/view/Makefile.am
index 648e8d9..302c953 100644
--- a/shell/view/Makefile.am
+++ b/shell/view/Makefile.am
@@ -12,4 +12,5 @@ sugar_PYTHON =				\
 	keyhandler.py			\
 	OverlayWindow.py		\
 	Shell.py			\
-	stylesheet.py
+	stylesheet.py			\
+	hardwaremanager.py
--
cgit v0.9.1