[empathy/f16: 4/5] Merge branch 'master' into f16

[Brian Pepple]

commit b9df4991ca2ffb18a8ff2a9292744ef2759d12ab
Merge: 9536d22 f2596c4
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Mon Aug 29 11:24:30 2011 -0400

    Merge branch 'master' into f16

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