RDRT tweaks
Back out last change to avoid conflict.
Merge branch 'master' of git://github.com/flavour/eden