Comment 2 for bug 490988

Sorry for not replying earlier, I was busy; I don't see MakeFile errors in the log, and after following the steps mentioned above I end up with pretty much everything (without restoring the backed up files), apart from a .bzr dir that was conflicting and I had removed it from the online interface.