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

[Brian Pepple]

commit 82721815e63e2167be623f7917ce6a9a39938b12
Merge: c698250 a9fd120
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Mon Apr 2 21:36:36 2012 -0400

    Merge branch 'master' into f17

 empathy.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---