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

[Brian Pepple]

commit c6982506e11850312341375aa1dc108f5c17be99
Merge: 05348e6 5295aa3
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Mon Mar 26 10:45:10 2012 -0400

    Merge branch 'master' into f17

 .gitignore   |    1 +
 empathy.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---