Clone of jdee@sf/trunk