Commit 88d38209 should probably go in this too, to add the fedora 18 build.