Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Sun, 4 Oct 2009 16:18:23 +0000 (16:18 +0000)
committerStef Walter <stef@memberwebs.com>
Sun, 4 Oct 2009 16:18:23 +0000 (16:18 +0000)

Trivial merge