[HEADS_UP] SVN HEAD is broken

[Ross Gardler]

The merge of the locationmap branch has broken SVN head. I'm pretty sure 
the problem is some changes that have not been brought across. 
Specifically the forrest.xconf file has no reference to the locationmap 
module.

I have to leave the office right now so cannot fix immediately. If noone 
has looked at it when I get back, I'll fix it straight away (mid 
afternoon UTC)

Ross