Merge commit 'origin/master' into polkit1
authorDan Williams <dcbw@redhat.com>
Wed, 26 Aug 2009 15:46:08 +0000 (10:46 -0500)
committerDan Williams <dcbw@redhat.com>
Wed, 26 Aug 2009 15:46:08 +0000 (10:46 -0500)

Trivial merge