Just fixing a broken build due to another bad merge by SVN. There was no reason it should have fucked that merge up but somehow it did.

Of course I didn't double check by building locally so that was my screwup but what I wouldn't give to use a decent source control tool