Merge branch 'master' into implement_dbus
authorHuang Peng <shawn.p.huang@gmail.com>
Sat, 27 Sep 2008 02:57:13 +0000 (10:57 +0800)
committerHuang Peng <shawn.p.huang@gmail.com>
Sat, 27 Sep 2008 02:57:13 +0000 (10:57 +0800)
1  2 
daemon/connection.py

Simple merge