Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Wed, 6 May 2009 20:45:25 +0000 (21:45 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 6 May 2009 20:45:25 +0000 (21:45 +0100)
commitbd62232f6ebac03455d3bde36cfb5a819c99f901
tree9d21851f2de0261972716635a65041d8bfdc83d1
parent34215744d79b2fcf146b69a59007d104085dff4a
parent3178b6d0688c9e8f255a459bc1fa267ae50fd38e
Merge with 0.4