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

[Brian Pepple]

commit dceec9d1786659a82b4ae80bb43e72e78f2b2560
Merge: 8272181 4678b35
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Thu Apr 5 11:30:06 2012 -0400

    Merge branch 'master' into f17

 .gitignore   |    1 +
 empathy.spec |   22 ++++++++++++++--------
 sources      |    2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)
---