update to latest from 2.6.12-rc2

(Logical change 1.181)
1 file changed