COPYING: merge GPLv2= from the 'copying' branch
authorW. Trevor King <wking@tremily.us>
Mon, 26 Nov 2012 15:36:06 +0000 (10:36 -0500)
committerW. Trevor King <wking@tremily.us>
Mon, 26 Nov 2012 15:36:45 +0000 (10:36 -0500)
Signed-off-by: W. Trevor King <wking@tremily.us>

Trivial merge