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

[Alexander Kurtakov]

commit 8599c953293e3b484f39ce345d6173b549ee072e
Merge: fdd6eda 47e5665
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed May 2 17:19:36 2012 +0300

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

 .gitignore           |    2 ++
 eclipse-shelled.spec |   10 +++++++---
 sources              |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index cc85c6d,c04e75d..01da129
--- a/.gitignore
+++ b/.gitignore
@@@ -2,3 -2,4 +2,5 @@@ ShellEd-Sources-2.0.0_M3.zi
  shelled-2.0.0-src.tar.bz2
  shelled-2.0.1-src.tar.bz2
  /shelled-2.0.2-src.tar.bz2
+ shelled-2.0.2-src-r133.tar.bz2
++