Merge remote-tracking branch 'origin/morphed/crate02'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Apr 2011 15:47:42 +0000 (17:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Apr 2011 15:47:42 +0000 (17:47 +0200)

Trivial merge