Update from Havokdan

git-svn-id: http://svn.vuze.com/public/client/trunk@40291 c2c1b7af-1477-405b-86ee-8aefd1fc4dd2
tidy up

git-svn-id: http://svn.vuze.com/public/client/trunk@40297 c2c1b7af-1477-405b-86ee-8aefd1fc4dd2