Merge branch 'master' into gfxpoly
authorMatthias Kramm <kramm@quiss.org>
Wed, 26 May 2010 15:27:11 +0000 (08:27 -0700)
committerMatthias Kramm <kramm@quiss.org>
Wed, 26 May 2010 15:27:11 +0000 (08:27 -0700)

Trivial merge