Merge remote branch 'origin/terencehill/freezetag_fix'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 29 Jan 2011 22:06:38 +0000 (23:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 29 Jan 2011 22:06:38 +0000 (23:06 +0100)

Trivial merge