Build systems strike again

Half-assed commits

Mozilla Firefox 3.0