Merge commit 'c5518de'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 23:43:32 +0000 (00:43 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 23:43:32 +0000 (00:43 +0100)

Trivial merge