[network-manager-netbook/f14/master: 2/2] fix merge

[Peter Robinson]

commit 8c7492091d733a3fccd684e4727d84749f1189bf
Merge: cb7c652 667b9e6
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Nov 4 15:09:02 2010 +0000

    fix merge

 .gitignore                   |    1 +
 network-manager-netbook.spec |   34 ++++++++++------------------------
 sources                      |    2 +-
 3 files changed, 12 insertions(+), 25 deletions(-)
---
diff --cc network-manager-netbook.spec
index 15c3647,a576557..aee803f
--- a/network-manager-netbook.spec
+++ b/network-manager-netbook.spec
@@@ -1,13 -1,7 +1,7 @@@
- # Tarfile created using git
- # git clone git://git.gnome.org/network-manager-netbook
- # git archive --format=tar --prefix=network-manager-netbook-%{version}/ %{git_version} | bzip2 > %{name}-%{version}.tar.bz2
- %define git_version f942521
- %define tarfile %{name}-%{version}.tar.bz2
- 
  Name:          network-manager-netbook
- Version:       1.7.1
- Release:       0.2%{?dist}
- Summary:       Moblin Netbook GUI for NetworkManager
+ Version:       1.8
+ Release:       1%{?dist}
 -Summary:       MeeGo Netbook GUI for NetworkManger
++Summary:       MeeGo Netbook GUI for NetworkManager
  
  Group:         Applications/Internet
  License:       GPLv2