am c2d5ffe0: Merge changes I6708bd40,I72e28e21

* commit 'c2d5ffe0b9baa1c24a62459b82bb21df08f4250b':
  Add support for the WindowBuilder Property Sheet
  Switch libraries from Eclipse 3.4 to Eclipse 3.6.2