[gupnp-dlna/f16: 3/3] fix merge

[Peter Robinson]

commit 09d9b76a729f658fb9754c63fa48cd51bf3e8903
Merge: 7d885cf fe2dbcd
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Oct 20 10:44:30 2011 +0100

    fix merge

 gupnp-dlna.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc gupnp-dlna.spec
index 6142a20,b891b15..b3dc543
--- a/gupnp-dlna.spec
+++ b/gupnp-dlna.spec
@@@ -81,10 -81,9 +81,13 @@@ find %{buildroot} -name '*.la' -exec r
  %{_datadir}/gtk-doc/html/%{name}
  
  %changelog
 +* Thu Oct 20 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.6.4-1
 +- 0.6.4 stable release
 +- http://ftp.gnome.org/pub/GNOME/sources/gupnp-dlna/0.6/gupnp-dlna-0.6.4.news
 +
+ * Mon Sep  6 2011 Zeeshan Ali <zeenix at redhat.com> - 0.6.3-2
+ - Push new release to build against latest gupnp and gupnp-av.
+ 
  * Fri Sep  2 2011 Zeeshan Ali <zeenix at redhat.com> - 0.6.3-1
  - 0.6.3 stable release
  - http://ftp.gnome.org/pub/GNOME/sources/gupnp-dlna/0.6/gupnp-dlna-0.6.3.news