[eclipse-collabnet-merge] (2 commits) ...Merge branch 'f17'

[mbooth]

Summary of changes:

  5553e7b... Update to version 3.0.9 and fix FTBFS (*)
  c24f4ca... Merge branch 'f17'

(*) This commit already existed in another branch; no separate mail sent