Minor re-merge of 2.6.16 header files santitized.
1 file changed