FC4 Datasteams

Restores existing versions of datastreams under Fedora4, also fixes #669 
Do we need this?