Merge change 129 into donut

* changes:
  Clean up trivial Eclipse warnings and fix whitespace.