Apply easy, non-invasive converging changes between trunk and devel codebases...
Apply easy, non-invasive converging changes between trunk and devel codebases (mostly uniform code formatting, small import changes, removing unused elements)
Apply easy, non-invasive converging changes between trunk and devel codebases (mostly uniform code formatting, small import changes, removing unused elements)