Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Sat, 10 Oct 2009 15:06:42 +0000 (15:06 +0000)
committerStef Walter <stef@memberwebs.com>
Sat, 10 Oct 2009 15:06:42 +0000 (15:06 +0000)

Trivial merge