merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1

indra/llmath/llcoord.h

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginclassmediaowner.h

indra/llui/CMakeLists.txt

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/llcombobox.cpp

indra/llui/llcombobox.h

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/lliconctrl.cpp

indra/llui/lliconctrl.h

indra/llui/lllayoutstack.cpp

indra/llui/lllocalcliprect.cpp

indra/llui/lllocalcliprect.h

indra/llui/llmenugl.cpp

indra/llui/llpanel.cpp

indra/llui/llpanel.h

indra/llui/llscrollbar.cpp

indra/llui/llscrollcontainer.cpp