Merge branch 'master' of ssh://david@people.freedesktop.org/~/DeviceKit-disks
authorDavid Zeuthen <davidz@redhat.com>
Thu, 10 Apr 2008 03:47:04 +0000 (23:47 -0400)
committerDavid Zeuthen <davidz@redhat.com>
Thu, 10 Apr 2008 03:47:04 +0000 (23:47 -0400)

Trivial merge