Merge remote branch 'origin/m0rfar/heaven'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 23:02:18 +0000 (01:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 23:02:18 +0000 (01:02 +0200)

Trivial merge