Clean up some inconsisnt background declarations that are causing inheritence problems (fixes #2699)
Clean up some inconsisnt background declarations that are causing inheritence problems (fixes #2699)


svn commit r31112

silverorange/swat,silverorange/swat