Synced to trunk revision 2378 for Chimera 3.0.1 push


git-svn-id: http://forge.voodooprojects.org/svn/chameleon@2391 b5af796a-00a8-11df-919b-ffff7a100b7d
Adding missing files from trunk merge


git-svn-id: http://forge.voodooprojects.org/svn/chameleon@2392 b5af796a-00a8-11df-919b-ffff7a100b7d
Final sync of trunk r2378


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