Merge remote branch 'origin/mookow/liquids'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 22:39:46 +0000 (00:39 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 22:39:46 +0000 (00:39 +0200)

Trivial merge