Merge branch 'upstream'

Merge branch 'upstream'

Conflicts:
	.gitignore
	AUTHORS
	autogen.sh
	config/Makefile.am
	config/default/Makefile.am
	config/default/base.src
	config/illume/base.src
	config/standard/Makefile.am
	config/standard/base.src
	configure.ac
	data/edje_externals/Makefile.am
	data/edje_externals/icons.edc
	data/images/Makefile.am
	data/objects/Makefile.am
	data/objects/test.edc
	data/themes/Makefile.am
	data/themes/default.edc
	doc/elementary.dox.in
	doc/foot.html
	doc/head.html
	elementary.spec.in
	m4/efl_binary.m4
	po/LINGUAS
	po/POTFILES.in
	po/ar.po
	po/az_IR.po
	po/de.po
	po/fa.po
	po/fr.po
	po/he.po
	po/it.po
	po/ko_KR.po
	po/ps.po
	po/pt.po
	po/ur.po
	po/yi.po
	src/bin/Makefile.am
	src/bin/config.c
	src/bin/test.c
	src/bin/test_actionslider.c
	src/bin/test_anchorblock.c
	src/bin/test_anchorview.c
	src/bin/test_anim.c
	src/bin/test_bg.c
	src/bin/test_box.c
	src/bin/test_bubble.c
	src/bin/test_button.c
	src/bin/test_calendar.c
	src/bin/test_check.c
	src/bin/test_clock.c
	src/bin/test_colorselector.c
	src/bin/test_conform.c
	src/bin/test_ctxpopup.c
	src/bin/test_cursor.c
	src/bin/test_diskselector.c
	src/bin/test_entry.c
	src/bin/test_fileselector.c
	src/bin/test_fileselector_button.c
	src/bin/test_fileselector_entry.c
	src/bin/test_flip.c
	src/bin/test_flipselector.c
	src/bin/test_floating.c
	src/bin/test_focus.c
	src/bin/test_focus2.c
	src/bin/test_focus3.c
	src/bin/test_gengrid.c
	src/bin/test_genlist.c
	src/bin/test_grid.c
	src/bin/test_hover.c
	src/bin/test_hoversel.c
	src/bin/test_icon.c
	src/bin/test_icon_desktops.c
	src/bin/test_index.c
	src/bin/test_inwin.c
	src/bin/test_label.c
	src/bin/test_launcher.c
	src/bin/test_layout.c
	src/bin/test_list.c
	src/bin/test_map.c
	src/bin/test_menu.c
	src/bin/test_multi.c
	src/bin/test_notify.c
	src/bin/test_pager.c
	src/bin/test_panel.c
	src/bin/test_panes.c
	src/bin/test_photo.c
	src/bin/test_photocam.c
	src/bin/test_progressbar.c
	src/bin/test_scaling.c
	src/bin/test_scroller.c
	src/bin/test_separator.c
	src/bin/test_slider.c
	src/bin/test_slideshow.c
	src/bin/test_store.c
	src/bin/test_table.c
	src/bin/test_thumb.c
	src/bin/test_toggle.c
	src/bin/test_toolbar.c
	src/bin/test_tooltip.c
	src/bin/test_transit.c
	src/bin/test_weather.c
	src/bin/test_win_state.c
	src/edje_externals/Makefile.am
	src/edje_externals/elm.c
	src/edje_externals/elm_button.c
	src/edje_externals/elm_gengrid.c
	src/edje_externals/elm_hoversel.c
	src/edje_externals/elm_icon.c
	src/edje_externals/elm_label.c
	src/edje_externals/elm_panes.c
	src/edje_externals/elm_scroller.c
	src/edje_externals/elm_slider.c
	src/edje_externals/elm_toggle.c
	src/edje_externals/modules.inc
	src/examples/actionslider_example_01.c
	src/examples/bubble_example_01.c
	src/examples/general_funcs_example.c
	src/lib/Elementary.h.in
	src/lib/Makefile.am
	src/lib/elc_anchorblock.c
	src/lib/elc_anchorview.c
	src/lib/elc_ctxpopup.c
	src/lib/elc_fileselector.c
	src/lib/elc_fileselector_button.c
	src/lib/elc_fileselector_entry.c
	src/lib/elc_hoversel.c
	src/lib/elc_scrolled_entry.c
	src/lib/elm_actionslider.c
	src/lib/elm_animator.c
	src/lib/elm_bg.c
	src/lib/elm_box.c
	src/lib/elm_bubble.c
	src/lib/elm_button.c
	src/lib/elm_calendar.c
	src/lib/elm_check.c
	src/lib/elm_clock.c
	src/lib/elm_cnp_helper.c
	src/lib/elm_colorselector.c
	src/lib/elm_config.c
	src/lib/elm_conform.c
	src/lib/elm_diskselector.c
	src/lib/elm_entry.c
	src/lib/elm_flip.c
	src/lib/elm_font.c
	src/lib/elm_frame.c
	src/lib/elm_gengrid.c
	src/lib/elm_genlist.c
	src/lib/elm_hover.c
	src/lib/elm_icon.c
	src/lib/elm_image.c
	src/lib/elm_index.c
	src/lib/elm_label.c
	src/lib/elm_layout.c
	src/lib/elm_list.c
	src/lib/elm_main.c
	src/lib/elm_map.c
	src/lib/elm_mapbuf.c
	src/lib/elm_menu.c
	src/lib/elm_module.c
	src/lib/elm_notify.c
	src/lib/elm_pager.c
	src/lib/elm_panel.c
	src/lib/elm_panes.c
	src/lib/elm_photo.c
	src/lib/elm_photocam.c
	src/lib/elm_priv.h
	src/lib/elm_progressbar.c
	src/lib/elm_radio.c
	src/lib/elm_scroller.c
	src/lib/elm_segment_control.c
	src/lib/elm_separator.c
	src/lib/elm_slider.c
	src/lib/elm_slideshow.c
	src/lib/elm_spinner.c
	src/lib/elm_store.c
	src/lib/elm_table.c
	src/lib/elm_theme.c
	src/lib/elm_thumb.c
	src/lib/elm_toggle.c
	src/lib/elm_toolbar.c
	src/lib/elm_transit.c
	src/lib/elm_widget.c
	src/lib/elm_widget.h
	src/lib/elm_win.c
	src/lib/els_box.c
	src/lib/els_cursor.c
	src/lib/els_icon.c
	src/lib/els_scroller.c
	src/lib/els_tooltip.c
	src/modules/Makefile.am