Merge branch 'polkit1'
authorLudwig Nussel <ludwig.nussel@suse.de>
Fri, 18 Jun 2010 08:52:53 +0000 (10:52 +0200)
committerLudwig Nussel <ludwig.nussel@suse.de>
Fri, 18 Jun 2010 09:55:59 +0000 (11:55 +0200)
commit2c887db04295f2ae0b926b7741a6f76c8275e1dd
tree179201f731bfd7a9517e402242f6c4f185664e25
parent9eda00a6e4f2cb0205cb35dad862684dabd1f440
parentc9ab2a08df0a5ea2c3ca99e29537e7c99f9931f9
Merge branch 'polkit1'

Conflicts:
fwzsd.py
fwzsd.py