 r9157@balin:  russel | 2008-01-31 13:20:53 +0000  Merged in changes from the 1_1_X branch.
 r9157@balin:  russel | 2008-01-31 13:20:53 +0000
 Merged in changes from the 1_1_X branch.


git-svn-id: 09612c73960e3111da5f49d785ce6caca2747963@8969 d02f77da-47a5-474d-b610-f18e4bea325a

codehaus/gant,Gant/Gant,codehaus/gant,russel/Gant,russel/Gant,russel/Gant,Gant/Gant,codehaus/gant,Gant/Gant