Basic merge to M5 using jdt.core v20120125-1544
157 files changed