Manual merge of the following commits from data/materials-dds.xml
authorStuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Tue, 24 Apr 2012 21:47:04 +0000 (22:47 +0100)
committerStuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Tue, 24 Apr 2012 21:47:04 +0000 (22:47 +0100)
commitf553a121c51ca2ae16e849edacb2b37a8b5665ed
tree6087ecf9898f891e4d6837aa70a87dd3db30b07f
parent2d60d1c5f1717c15ad074a95d52e2d0aaaa6913c
Manual merge of the following commits from data/materials-dds.xml

532c93cfa06c3be2d5b47cbffe33a89c04433b8a
c32204a079ea204ff10c2961e75e5cea9ae98afc
d66d417dea5dc0cf06222627ba3ccf9de6506630
Materials/dds/materials.xml
Materials/default/materials.xml