Mesa (master): Merge branch 'glapi-reorg'

Fri Oct 29 05:02:33 UTC 2010

Module: Mesa
Branch: master
Commit: 9de5c6a1cb1428154c371f4331b55b5161957b50
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9de5c6a1cb1428154c371f4331b55b5161957b50

Author: Chia-I Wu <olv at lunarg.com>
Date:   Fri Oct 29 12:45:04 2010 +0800

Merge branch 'glapi-reorg'

Conflicts:
	src/mapi/glapi/glapi_sparc.S
	src/mapi/glapi/glapi_x86.S
	src/mapi/glapi/glapidispatch.h
	src/mapi/glapi/glapioffsets.h
	src/mapi/glapi/glprocs.h

---