Merge remote branch 'origin/fruitiex/effect_e8circle'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 11:46:45 +0000 (13:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 11:46:45 +0000 (13:46 +0200)

Trivial merge