Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 18 May 2010 19:07:42 +0000 (21:07 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 18 May 2010 19:07:42 +0000 (21:07 +0200)

Trivial merge