[rygel/f15: 2/2] fix merge

[Peter Robinson]

commit 91a0738d54aafa275758463da4a77eaf105c6d26
Merge: 99336ec 8419bd3
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Jul 17 00:26:35 2011 +0100

    fix merge

 .gitignore |   20 +-------------------
 rygel.spec |    3 +++
 2 files changed, 4 insertions(+), 19 deletions(-)
---
diff --cc .gitignore
index ded55b1,73b422a..2c21ffd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,19 -1,2 +1,1 @@@
- rygel-0.7.2.tar.bz2
- /rygel-0.7.6.tar.bz2
- /rygel-0.7.7.tar.bz2
- /rygel-0.7.8.tar.bz2
- /rygel-0.8.0.tar.bz2
- /rygel-0.8.1.tar.bz2
- /rygel-0.9.0.tar.bz2
- /rygel-0.9.1.tar.bz2
- /rygel-0.9.2.tar.bz2
- /rygel-0.9.3.tar.bz2
- /rygel-0.9.4.tar.bz2
- /rygel-0.9.5.tar.bz2
- /rygel-0.9.6.tar.bz2
- /rygel-0.9.7.tar.bz2
- /rygel-0.9.8.tar.bz2
- /rygel-0.9.9.tar.bz2
- /rygel-0.10.0.tar.bz2
- /rygel-0.10.1.tar.bz2
- /rygel-0.10.3.tar.xz
 -/rygel-*.tar.bz2
 -/rygel-*.tar.xz
++rygel-0.10.3.tar.xz
diff --cc rygel.spec
index 416696b,310463a..57d0131
--- a/rygel.spec
+++ b/rygel.spec
@@@ -110,11 -111,9 +110,14 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_datadir}/vala/vapi/rygel-1.0.vapi
  
  %changelog
 +* Sun Jul 17 2011 Peter Robinson <pbrobinson at gmail.com> 0.10.3-1
 +- Update to 0.10.3
 +- http://ftp.gnome.org/pub/GNOME/sources/rygel/0.10/rygel-0.10.3.news
 +- Update description - fixes RHBZ 701034
 +
+ * Tue May 31 2011 Christopher Aillon <caillon at redhat.com> 0.10.2-1
+ - Update to 0.10.2
+ 
  * Mon Apr 18 2011 Peter Robinson <pbrobinson at gmail.com> 0.10.1-1
  - Update to 0.10.1