Fix a linux compile thing.
Another linux thing.
...
Merge branch 'master' of git://github.com/aurora-sim/Aurora-Sim
...