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

[jerboaa]

commit 211823ad20ea97e7fb2a22e38fd1a9184334b2c4
Merge: cc8428a 99f02f0
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Mon Oct 25 15:51:13 2010 -0400

    merging refs/heads/master into HEAD

 eclipse-fedorapackager.spec |   19 ++++++++++++++-----
 sources                     |    2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --cc eclipse-fedorapackager.spec
index b0d2a38,56887fd..cb50b79
--- a/eclipse-fedorapackager.spec
+++ b/eclipse-fedorapackager.spec
@@@ -98,8 -98,16 +98,17 @@@ pop
  %doc org.fedoraproject.eclipse.packager-feature/*.html
  
  %changelog
+ * Wed Oct 20 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.8-1
+ - Improve error checking in import wizard.
+ - Update user documentation.
+ - Upstream release 0.1.8
+ 
+ * Tue Oct 19 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.7-1
+ - Include potential fix for Ticket #34 (download performance
+   problem).
+ 
  * Thu Oct 14 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.6-1
 +- Merged changes from rawhide. Changes include:
  - Remove eclipse-jgit R/BR since JGit is required by EGit
  - Note: EGit API isn't stable yet. So, this package (0.1.6) might
    or might not work with EGit 0.10.x. It's known to work with