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

[Brian Pepple]

commit 82461fd73e2557ba042567cc4ceb76746744134d
Merge: 6558dc4 3804d2d
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Sat Mar 10 11:28:47 2012 -0500

    Merge branch 'master' into f17

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