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)
commit5a29dfef2416eed6004dd32b66f6a7b3ff5e407f
tree438cc6186b29443de0479f938722135f68cebc61
parenta5eb29ad9f8f98ac8d3e6f971e2974fd62dd993b
parent592769cfd9d3c040df03b3bdb84327530968ac7d
Merge commit 'origin/master' into polkit1