Apply patch extracted from old SVN development tree
Add missing license text
Stop abusing Spring and do the list merging we'd hoped it would do.
rebased