Fix recently accepted into 2.6 mainline: http://linux.bkbits.net:8080/linux-2.6/gnupatch@40e6158bme9avS6IqahBN0wa9zx7LQ