Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:36:15 +0000 (10:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:36:15 +0000 (10:36 +0200)

Trivial merge