[eclipse-fedorapackager/f14/master: 4/4] merging refs/heads/master into HEAD

[jerboaa]

commit e7b8a0ef83c1fc0ad6d1c41760ac69571abe7b9c
Merge: 2b97994 beae4a9
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Sep 30 12:12:55 2010 -0400

    merging refs/heads/master into HEAD

 eclipse-fedorapackager.spec |   11 +++++++----
 sources                     |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --cc eclipse-fedorapackager.spec
index 7b90474,6e6da79..eed7994
--- a/eclipse-fedorapackager.spec
+++ b/eclipse-fedorapackager.spec
@@@ -2,8 -2,8 +2,8 @@@
  %global install_loc    %{_datadir}/eclipse/dropins/packager
  
  Name:           eclipse-fedorapackager
- Version:        0.1.0
- Release:        0.3%{?dist}
+ Version:        0.1.1
 -Release:        2%{?dist}
++Release:        1%{?dist}
  Summary:        Fedora Packager Tools
  
  Group:          Development/Tools
@@@ -97,6 -97,13 +97,9 @@@ pop
  %doc org.fedoraproject.eclipse.packager-feature/*.html
  
  %changelog
 -* Thu Sep 30 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.1-2
 -- Spin new release to fix replace sources bug.
 -
 -* Wed Sep 29 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.1-1
 -- Update to upstream 0.1.1
 -- Various bug fixes.
++* Thu Sep 30 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.1-1
++- Merge changes from master.
+ 
  * Fri Aug 27 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.0-0.3
  - Updated Eclipse help for Eclipse Fedora Packager.