Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 7 Jun 2010 11:19:14 +0000 (12:19 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 7 Jun 2010 11:19:14 +0000 (12:19 +0100)
commit3456013cbd8feceb716f55c4c71762c585854151
tree0a15c5ca7eba1c6770abdfe85d0ed6f594b0e68e
parent03faf1378ba284d46d71775c88a5c61786017bdc
parent5d778cf2f15911224564e54fe0556a0c8cc7b905
Merge 0.7->trunk