merge to tip of tree

This commit is contained in:
Dan Williams 2006-04-27 15:18:14 -04:00
parent d8dd8f8a65
commit dce4a8c13c

View File

@ -14,7 +14,7 @@ import os
import pwd import pwd
import socket import socket
from sugar import activity import activity
import presence import presence
import BuddyList import BuddyList