First real commit. Imported from svn.