Recreating my GSoC branch.
authorJoerg Mueller <nexyon@gmail.com>
Sat, 19 Jun 2010 10:32:41 +0000 (10:32 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Sat, 19 Jun 2010 10:32:41 +0000 (10:32 +0000)

Trivial merge