Merge branch 'f14/user/steved/pnfs-f14' of ssh://pkgs.fedoraproject.org/kernel into f14/user/steved/pnfs-f14

Conflicts:
	kernel.spec
This commit is contained in:
Steve Dickson 2010-11-01 09:17:00 -04:00
commit 97df345045

Diff Content Not Available