[eclipse-rpm-editor/f17: 3/3] Merge branch 'master' into f17

[Alexander Kurtakov]

commit 707faf1c522657194c7fb65f062f7030fcee0653
Merge: 86b0664 b0d7453
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Jul 11 13:47:59 2012 +0300

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	eclipse-rpm-editor.spec
    	sources

 .gitignore              |    2 ++
 eclipse-rpm-editor.spec |   21 +++++++++++----------
 sources                 |    3 +--
 3 files changed, 14 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index eb75e17,bef1f13..4b39eac
--- a/.gitignore
+++ b/.gitignore
@@@ -12,3 -12,4 +12,5 @@@ linuxtools-rpm-SNAPSHOT-2168cacb673f358
  /eclipse-rpm-editor-0.9.0-0.1.20110815git2168cacb.fc17.src.rpm
  linuxtools-rpm-parent-0.9.0-src.tar.bz2
  /linuxtools-rpm-parent-0.10.0-src.tar.bz2
+ linuxtools-rpm-parent-1.0.0-src.tar.bz2
++