Merge branch 'master' into gfxpoly
authorMatthias Kramm <kramm@quiss.org>
Tue, 25 May 2010 17:09:56 +0000 (10:09 -0700)
committerMatthias Kramm <kramm@quiss.org>
Tue, 25 May 2010 17:09:56 +0000 (10:09 -0700)

Trivial merge