Merge commit 'refs/changes/77/9077/3' of git://git.eclipse.org/gitroot/bpel/org.eclipse.bpel into develop
diff --git a/.gitignore b/.gitignore
index 5b0a486..d578ae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@
 # additional stuff

 .metadata/

 bin/

-.settings/

 *.swp

 

 *~