Merge branch 'master' into implement_dbus
authorHuang Peng <shawn.p.huang@gmail.com>
Wed, 24 Sep 2008 09:51:02 +0000 (17:51 +0800)
committerHuang Peng <shawn.p.huang@gmail.com>
Wed, 24 Sep 2008 09:51:02 +0000 (17:51 +0800)
commit743c41803aa27d5a9f2dee257f9831fe7239ab59
tree3be7f5ab03ecc6d64d8ebca54123bc3f911889d7
parentf011322081b6e3e932f954fc1aab3f44441a01bb
parent025371daba5b8e51c78eff8da15bebab3c7a2e03
Merge branch 'master' into implement_dbus