[libmate/f17: 2/2] Merge branch 'master' into f17

[Dan Mashal]

commit d779e90608460b995a2401db1f20dbda910c2058
Merge: ba6297b 87511f1
Author: dmashal <dan.mashal at fedoraproject.org>
Date:   Mon Sep 24 19:04:28 2012 -0700

    Merge branch 'master' into f17

 libmate.spec |   76 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 47 insertions(+), 29 deletions(-)
---