Merge change Ib4a23918 into eclair-mr2

* changes:
  Updating sample plugin to test java class loading.