Cvs/fedora 2 5 branch