o Apparently because some patch was applied twice, many header files had their contents doubled. Fixing this as well. svn-id: r23548
svn-id: r23459
svn-id: r23452