Merge remote-tracking branch 'linux-2.6.32.y/master' into develop