commit c3c99c8d3e56204270a2eb811e896ba472b718b8 Merge: 943c2dd 1ffb995 Author: Daniel Drake <dsd at laptop.org> Date: Thu Jan 13 22:09:30 2011 +0000 Merge branch 'master' into f14 .gitignore | 1 + sources | 2 +- xorg-x11-drv-geode.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) ---