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

[Brian Pepple]

commit 5570f88d0a7325c62ce212ebab2bc7eca3abc395
Merge: f4de7b5 6cdb013
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Mon Apr 16 10:08:27 2012 -0400

    Merge branch 'master' into f17

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