Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/