Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Tue, 24 Nov 2009 16:26:06 +0000 (16:26 +0000)
committerStef Walter <stef@memberwebs.com>
Tue, 24 Nov 2009 16:26:06 +0000 (16:26 +0000)

Trivial merge