Merge remote branch 'jamey/for-keith'
authorKeith Packard <keithp@keithp.com>
Fri, 30 Apr 2010 19:40:53 +0000 (12:40 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 30 Apr 2010 19:40:53 +0000 (12:40 -0700)
commit986d46144b183a36b4e98aed95eca0c55a8b4251
tree2c82ce4ec7e20d85a04b6e659716fdf6604f9985
parenta974c8e7cba40c8d7d1b91e07de8c414627b71a2
parentb5b8f91b82d7b150c926dd3fecee6c3aafff6e39
Merge remote branch 'jamey/for-keith'

Conflicts:
hw/xfree86/common/xf86xv.c