Initial commit
Merge /home/descent/twin-0.6.2