Merge branch 'master' into gibbs
authorJoris Mooij <joris@jorismooij.nl>
Fri, 14 Nov 2008 16:03:12 +0000 (17:03 +0100)
committerJoris Mooij <joris@jorismooij.nl>
Fri, 14 Nov 2008 16:03:12 +0000 (17:03 +0100)

Trivial merge