From: David Zeuthen <davidz@redhat.com>
Date: Fri, 26 Aug 2011 17:14:47 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/gdbus-port'
X-Git-Tag: upstream/2.1.2~480
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3890058e3bafb05f7431304ea793740b62f7d4e9;p=platform%2Fupstream%2Fudisks2.git

Merge remote-tracking branch 'origin/gdbus-port'

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

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

3890058e3bafb05f7431304ea793740b62f7d4e9