Zhenyu Wang 31654f52b0 Merge branch 'master' into xvmc ... Conflicts: man/intel.man src/i830_driver.c		2008-03-11 14:37:41 +08:00
..
Makefile.am	Makefile.am: nuke RCS Id	2008-03-08 23:36:56 +01:00
intel.man	Merge branch 'master' into xvmc	2008-03-11 14:37:41 +08:00