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

[Brian Pepple]

commit 28711fc268a6ee5e6c8a630765d3e6e844392999
Merge: dceec9d 99a3fa7
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Thu Apr 5 12:41:18 2012 -0400

    Merge branch 'master' into f17

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