[mate-polkit/f18: 3/3] Merge branch 'master' into f18

[Dan Mashal]

commit baa9c47b81f1768d38e460307748feb30929219b
Merge: 724d4f2 22510be
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sun Aug 26 15:56:22 2012 -0700

    Merge branch 'master' into f18

 mate-polkit.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---