Rename etc/org/COPYRIGHT-AND-LICENSE to etc/org/README for consistency
with other copyright files, and add a reference to it in the .xml
files.
This changes have been made by Chong Yidong in Emacs trunk:
http://lists.gnu.org/archive/html/emacs-diffs/2012-01/msg00010.html