Merge branch 'development' into release
Merge remote-tracking branch 'fabio_pydev/master' into release

Conflicts:
	builders/com.aptana.pydev.build/update_site/site.xml
Fixing the pydev build.
Added the missing features.
Merge branch 'development' into release

Conflicts:
	builders/com.aptana.pydev.build/build_local.properties
	features/com.aptana.pydev.feature/feature.xml
Removed the unused features.
Made PyDev JRE 1.6 compatible.
Fixing Pydev build.
Fixing PyDev build.
Make pydev plugins 1.6 compatible.
Merge branch 'release' into development