From ff2bee3d9b560148472633381f6dd74d2ebf24ba Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Sun, 29 Oct 2006 16:35:50 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
diff --git a/services/nm/sugar-nm-applet b/services/nm/sugar-nm-applet
index cef78f4..c84e804 100644
--- a/services/nm/sugar-nm-applet
+++ b/services/nm/sugar-nm-applet
@@ -1,4 +1,4 @@
-#! /bin/env python
+#!/usr/bin/python
 # vi: ts=4 ai noet 
 #
 # Copyright (C) 2006, Red Hat, Inc.
diff --git a/services/presence/sugar-presence-service b/services/presence/sugar-presence-service
index b2261b4..fc42e31 100755
--- a/services/presence/sugar-presence-service
+++ b/services/presence/sugar-presence-service
@@ -1,4 +1,22 @@
 #!/usr/bin/python
+# vi: ts=4 ai noet 
+#
+# Copyright (C) 2006, Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 import logging
 import sys
 import os
--
cgit v0.9.1