--- a/open-src/driver/xf86-video-intel/COPYING	Fri Aug 06 14:40:21 2010 -0700
+++ b/open-src/driver/xf86-video-intel/COPYING	Mon Aug 09 10:37:24 2010 -0700
@@ -1,3 +1,29 @@
+Copyright © 2006, 2007, 2008, 2009 Intel Corporation
+Copyright 2007, 2008 Red Hat, Inc.
+Copyright 2006 Luc Verhaegen.
+Copyright © 2007 Dave Mueller
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*************************************************************************
+
 Copyright 2000, 2001 Intel Corporation.  All Rights Reserved.
 Copyright © 2002 by Alan Hourihane and David Dawes
 
@@ -23,36 +49,10 @@
 
 *************************************************************************
 
-Copyright © 2006, 2007, 2008 Intel Corporation
-Copyright 2007, 2008 Red Hat, Inc.
-Copyright 2006 Luc Verhaegen.
-Copyright © 2007 Dave Mueller
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
+Copyright © 1999 Keith Packard
 
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-*************************************************************************
-
-Copyright � 1999 Keith Packard
-
-Copyright � 2001 Keith Packard
-Partly based on code that is Copyright � The XFree86 Project Inc.
+Copyright © 2001 Keith Packard
+Partly based on code that is Copyright © The XFree86 Project Inc.
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
@@ -74,7 +74,7 @@
 
 *************************************************************************
 
-Copyright � 2002 Keith Packard, member of The XFree86 Project, Inc.
+Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
 Copyright © 2000, 2006, 2007, 2008 Keith Packard
             2004 Eric Anholt
             2005 Zack Rusin, Trolltech
@@ -307,8 +307,8 @@
 
 *************************************************************************
 
-Copyright � 2002 David Dawes
-Copyright � 2006 Intel Corporation
+Copyright © 2002 David Dawes
+Copyright © 2006 Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -473,32 +473,3 @@
 ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-Copyright ? 2009 Intel Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE
-
-Authors:
-     Zhenyu Wang <[email protected]>
-
-
-