Merge commit 'origin/polkit1'
authorDan Williams <dcbw@redhat.com>
Wed, 26 Aug 2009 17:18:30 +0000 (12:18 -0500)
committerDan Williams <dcbw@redhat.com>
Wed, 26 Aug 2009 17:18:30 +0000 (12:18 -0500)

Trivial merge