Manual merge from data/materials.xml of
authorStuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Tue, 24 Apr 2012 21:33:32 +0000 (22:33 +0100)
committerStuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Tue, 24 Apr 2012 21:33:32 +0000 (22:33 +0100)
commit2d60d1c5f1717c15ad074a95d52e2d0aaaa6913c
treec816e06edbe78c22a1c4f8f208cc0fa7ad97111f
parent92c47128503d3d7d6e0efd13a5876b2f4288cb2e
Manual merge from data/materials.xml of

532c93cfa06c3be2d5b47cbffe33a89c04433b8a
c32204a079ea204ff10c2961e75e5cea9ae98afc
d66d417dea5dc0cf06222627ba3ccf9de6506630

into the new Materials definitions.
Materials/base/materials-base.xml
Materials/default/materials.xml