pci.ids license

[Alan Coopersmith]

I went to check today for an update to the pci.ids file we ship in
the Xorg source.   When diff'ing the new version against the old
I saw this line was added:

#       This file can be distributed under either the GNU General Public License
#       (version 2 or higher) or under the BSD License.

Previously this file had no license, but it's mostly just a data file,
and doesn't even have a copyright notice.   Is the above informal license
going to annoy anyone if I commit the updated version to Xorg HEAD?
(Can we assume he means the modern BSD license, sans advertising clause?
  I believe that's a generally acceptable license for Xorg contents.)

[At times like this I wonder if Xorg should have a Licensing Task
  Force to come up with a set of rules for what licenses are
  acceptable and to vote yea or nay on accepting code under new
  licenses.   Hopefully it shouldn't be too high traffic, and
  if it could reduce the number of license variants we have in the
  Xorg trees, that would be even better.]

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering