Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1