Merge remote branch 'refs/remotes/origin/esteel/finished/fixserver'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 18 Sep 2010 10:39:45 +0000 (12:39 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 18 Sep 2010 10:39:45 +0000 (12:39 +0200)

Trivial merge