Merge Simon Wikinson and Asanka changes into 1-4 branch
commit863488e21527f9c6e20ebc7e97b06b7184b9151c
authorLove Hornquist Astrand <lha@h5l.org>
Tue, 14 Sep 2010 17:27:32 +0000 (14 10:27 -0700)
committerLove Hornquist Astrand <lha@h5l.org>
Tue, 14 Sep 2010 17:27:32 +0000 (14 10:27 -0700)
tree9ca92f09f3d65c512742cb9933ef99494245e9b0
parent5a58813cca26c42beb05a7134ae5232373460e6f
parentd28ec4ba612042a51fd3544b92a3622a6d35207c
Merge Simon Wikinson and Asanka changes into 1-4 branch