Merge some trunk r2359 changes

git-svn-id: http://forge.voodooprojects.org/svn/chameleon@2360 b5af796a-00a8-11df-919b-ffff7a100b7d
Merge latest DMI improvements from Bungo's branch.

git-svn-id: http://forge.voodooprojects.org/svn/chameleon@2361 b5af796a-00a8-11df-919b-ffff7a100b7d
Min typos.

git-svn-id: http://forge.voodooprojects.org/svn/chameleon@2362 b5af796a-00a8-11df-919b-ffff7a100b7d