Merge remote-tracking branch 'origin/gdbus-port'
authorDavid Zeuthen <davidz@redhat.com>
Fri, 26 Aug 2011 17:14:47 +0000 (13:14 -0400)
committerDavid Zeuthen <davidz@redhat.com>
Fri, 26 Aug 2011 17:14:47 +0000 (13:14 -0400)
commit3890058e3bafb05f7431304ea793740b62f7d4e9
treedfc4b8c965bff4270a27f7a77410c80c15cf3371
parent0338f11ff0ea8edb3c4767fc7cb6b43727e37616
parente9f628ed420f90310d6078b7d27830114737a354
Merge remote-tracking branch 'origin/gdbus-port'

Conflicts:
tools/udisks-bash-completion.sh
tools/udisks.c

Signed-off-by: David Zeuthen <davidz@redhat.com>