[gupnp-vala/f16: 2/2] fix merge

[Peter Robinson]

commit cd8b4b6e69f4eeeacd234290500a4ca047200d50
Merge: af2cb0c 20e1984
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Sep 11 12:19:50 2011 +0100

    fix merge

 .gitignore      |    1 +
 gupnp-vala.spec |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc gupnp-vala.spec
index 202400c,3e5b75e..0dd6781
--- a/gupnp-vala.spec
+++ b/gupnp-vala.spec
@@@ -55,13 -55,16 +55,16 @@@ make chec
  %{_libdir}/pkgconfig/gupnp-vala-1.0.pc
  
  %changelog
- * Sun Sep 11 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.10.1-1
+ * Mon Sep  6 2011 Zeeshan Ali <zali at redhat.com> 0.10.1-1
  - 0.10.1 stable release
 +- http://ftp.gnome.org/pub/GNOME/sources/gupnp-vala/0.10/gupnp-vala-0.10.1.news
  
 -- http://ftp.acc.umu.se/pub/GNOME/sources/gupnp-vala/0.10/gupnp-vala-0.10.0.news
+ * Mon Sep  6 2011 Zeeshan Ali <zali at redhat.com> 0.10.0-2
+ - New release to build against latest gupnp*.
+ 
  * Mon Sep  2 2011 Zeeshan Ali <zali at redhat.com> 0.10.0-1
  - 0.10.0 stable release
 -- http://ftp.acc.umu.se/pub/GNOME/sources/gupnp-vala/0.10/gupnp-vala-0.10.0.news
 +- http://ftp.gnome.org/pub/GNOME/sources/gupnp-vala/0.10/gupnp-vala-0.10.0.news
  - Correct CamelCasing for UPnP in summary.
  
  * Mon Aug 6 2011 Zeeshan Ali <zali at redhat.com> 0.9.0-2