Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=546894Change-Id: Ifd8ec49c4121ffef34c638ee65cc45bb423caaff
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=546896Change-Id: I0b75ece2c6b254368f041fe3376323915aaa121b