Merge branch 'master' into wip_alan_T5654_roojspacker_get_it_working_as
[roojs1] / resources_licence.txt
2010-04-06 www-datainitial import