Merge remote branch 'origin/gdbus'
authorDavid Zeuthen <davidz@redhat.com>
Fri, 6 Aug 2010 17:25:37 +0000 (13:25 -0400)
committerDavid Zeuthen <davidz@redhat.com>
Fri, 6 Aug 2010 17:25:37 +0000 (13:25 -0400)

Trivial merge