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

[Brian Pepple]

commit 77b7fa2712f1498016ded10d2e5ab08df523d804
Merge: 18c0d53 438c7a9
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Tue Mar 22 14:03:58 2011 -0400

    Merge branch 'master' into f15

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