update formatting to match trunk
update formatting to match trunk

SOFTWARE-1129


git-svn-id: 66bf0610f1f1946723b4664e9fd29d95a25942e4@19032 4e558342-562e-0410-864c-e07659590f8c

efajardo/osg-test,efajardo/osg-test