merge r2116 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2168 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 23:36:32 +00:00
parent cca3f49cd0
commit 28b7ddce71

View file

@ -32,7 +32,7 @@ USA.
<defaults> <defaults>
<allow_any>no</allow_any> <allow_any>no</allow_any>
<allow_inactive>no</allow_inactive> <allow_inactive>no</allow_inactive>
<allow_active>auth_admin_keep_always</allow_active> <allow_active>no</allow_active>
</defaults> </defaults>
</action> </action>
@ -42,7 +42,7 @@ USA.
<defaults> <defaults>
<allow_any>no</allow_any> <allow_any>no</allow_any>
<allow_inactive>no</allow_inactive> <allow_inactive>no</allow_inactive>
<allow_active>auth_admin_keep_always</allow_active> <allow_active>no</allow_active>
</defaults> </defaults>
</action> </action>