Merge branch 'slatez-applets'

Conflicts:
	Makefile.am
	configure.ac

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

diff --cc Makefile.am
index 20268959583e0d5f41e4505c7f18a16fcda588b9,8148380008b73dfb449615f59559c5deac859114..3ce04575e4aefe93251246b1732f6a483c47972f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -8,10 -4,10 +4,6 @@@ if HAVE_NS
  SUBDIRS += nautilus-sendto-plugin
  endif
  
- if HAVE_NOTHERE
- SUBDIRS += nothere
 -if HAVE_PYTHON
 -SUBDIRS += python
--endif
--
  if HAVE_TESTS
  SUBDIRS += tests
  endif

diff --cc configure.ac
index facdd7ce1a02b377f4e7891518af3edf6adadc82,502c550121f35d2e06c091a9dc8d7268d80c9fff..fbe8984431c1254b8e09b41c2e382bbfc1dbb8bb
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -523,7 -501,6 +463,5 @@@ Configure summary
  
      Extras:
        Documentation...............:  ${enable_gtk_doc}
-       Megaphone applet............:  ${have_megaphone}
-       Nothere applet..............:  ${have_nothere}
 -      Python bindings.............:  ${have_python}
        Nautilus-sendto plugin......:  ${have_nst}
  "