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)
commitc0c83da1a045258025a2825f437af7a5e602c9c9
treec991ca5f8d3ad8748fd9dd6c77301d0266bf71d5
parent14b07e19c6db6eefe35fac05b1772e7ee9a74436
parent956a73d3cab11cd541ebc57d7a8564a22f16f992
Merge with 0.4