Merge remote branch 'refs/remotes/origin/tzork/turrets'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 15 May 2010 18:14:42 +0000 (20:14 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 15 May 2010 18:14:42 +0000 (20:14 +0200)

Trivial merge