Merge branch 'master' into implement_dbus
authorHuang Peng <shawn.p.huang@gmail.com>
Wed, 24 Sep 2008 10:51:16 +0000 (18:51 +0800)
committerHuang Peng <shawn.p.huang@gmail.com>
Wed, 24 Sep 2008 10:51:16 +0000 (18:51 +0800)

Trivial merge