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

[Dan Mashal]

commit aeef16047b75a3f642360c550a1513009377bd67
Merge: 5b36f73 1be478a
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Thu Nov 22 17:50:42 2012 -0800

    Merge branch 'master' into f17

 .gitignore       |    1 +
 mate-polkit.spec |   41 ++++++++++++++++++++++++++++-------------
 sources          |    2 +-
 3 files changed, 30 insertions(+), 14 deletions(-)
---