merge

indra/llcommon/llcursortypes.cpp

indra/llcommon/llcursortypes.h

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginprocesschild.cpp

indra/llplugin/llpluginprocesschild.h

indra/llplugin/llpluginprocessparent.cpp

indra/llplugin/llpluginprocessparent.h

indra/llui/llurlentry.cpp

indra/llui/llurlentry.h

indra/llui/llview.cpp

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowwin32.cpp

indra/media_plugins/example/media_plugin_example.cpp

.../media_plugins/gstreamer010/media_plugin_gstreamer010.cpp

indra/media_plugins/quicktime/media_plugin_quicktime.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif

indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif

indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif