Merge remote branch 'origin/savagex/moarfixes'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 2 Nov 2010 14:42:15 +0000 (15:42 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 2 Nov 2010 14:42:15 +0000 (15:42 +0100)

Trivial merge