Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Sat, 26 Sep 2009 01:55:50 +0000 (01:55 +0000)
committerStef Walter <stef@memberwebs.com>
Sat, 26 Sep 2009 01:55:50 +0000 (01:55 +0000)

Trivial merge