Merge branch 'master' into effects
authorPatrik Gornicz <Gornicz.P@gmail.com>
Mon, 21 Jul 2008 03:27:42 +0000 (23:27 -0400)
committerPatrik Gornicz <Gornicz.P@gmail.com>
Mon, 21 Jul 2008 03:27:42 +0000 (23:27 -0400)

Trivial merge