OS X build slave failing

[Branko Čibej]

The OSX build slave is failing on a couple of the conflict resolver
tests over ra_svn. Can someone please take the time to figure it out?
Otherwise my maintaining the build slave makes no sense ...

-- Brane