[eclipse-rpmstubby/f17: 4/4] Merge branch 'master' into f17

[Alexander Kurtakov]

commit 74d3eacff90fa7e292dd82f492f16d608633faf9
Merge: e4e043e 4deb6d1
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Jul 11 14:52:53 2012 +0300

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

 .gitignore             |    1 +
 eclipse-rpmstubby.spec |   20 +++++++++-----------
 sources                |    4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)
---
diff --cc sources
index ccf7e44,bddcc86..ecce0c5
--- a/sources
+++ b/sources
@@@ -1,2 -1,1 +1,2 @@@
- e467da8d02737211eb3f16fc7ae2b7e1  linuxtools-rpmstubby-parent-0.9.0-src.tar.bz2
- 495e83761a456f8545221940fec3b91e  eclipse-rpmstuby-2adb2a7.tar.bz2
+ 05f7ae74c50001920d495845db13152d  linuxtools-rpmstubby-parent-1.0.0-src.tar.bz2
++