Merge remote branch 'refs/remotes/origin/merlijn/download-script-fix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 06:35:03 +0000 (08:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 06:35:03 +0000 (08:35 +0200)

Trivial merge