Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Sun, 30 Aug 2009 14:13:45 +0000 (14:13 +0000)
committerStef Walter <stef@memberwebs.com>
Sun, 30 Aug 2009 14:13:45 +0000 (14:13 +0000)

Trivial merge