Trunk sync r9930.

git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@9931 387891d4-d844-0410-90c0-e4c51a9137d3
Fixed some messed up merging.

git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@9932 387891d4-d844-0410-90c0-e4c51a9137d3