Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Mon, 9 Nov 2009 17:08:08 +0000 (17:08 +0000)
committerStef Walter <stef@memberwebs.com>
Mon, 9 Nov 2009 17:08:08 +0000 (17:08 +0000)

Trivial merge