Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36