Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Fri, 22 May 2009 14:19:12 +0000 (15:19 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 22 May 2009 14:19:12 +0000 (15:19 +0100)

Trivial merge