Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

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.

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