[empathy/f16: 6/6] Fix merge

[Brian Pepple]

commit 9536d225da03d769b4cbf29f1bf07da4d88650c0
Merge: d31d85b d870b77
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Mon Aug 22 13:20:47 2011 -0400

    Fix merge

 .gitignore   |    1 +
 empathy.spec |   18 ++++++++++++------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --cc empathy.spec
index ab8a63b,4e7917c..70542b0
--- a/empathy.spec
+++ b/empathy.spec
@@@ -156,6 -157,14 +157,11 @@@ glib-compile-schemas %{_datadir}/glib-2
  %{_libexecdir}/empathy-chat
  
  %changelog
+ * Mon Aug 22 2011 Brian Pepple <bpepple at fedoraproject.org> - 3.1.5.1-1
+ - Update to 3.1.5.1.
+ - Add BR on libgudev1-devel.
+ - Bump min requires for tp-glib & webkitgtk.
+ 
 -* Sat Aug 20 2011 Brian Pepple <bpepple at fedoraproject.org> - 3.1.5-4
 -- Rebuld for new gnome keyring
 -
  * Fri Aug 19 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.5-3
  - Rebuild