- Merged changesets 1399 up to and including 1415 into 1.2 branch

diff --git a/Makefile b/Makefile
index 4713cfe..d29d830 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,18 @@
 	    fi                                  \
 	done
 
+uninstall:
+	rm -rf $(DESTDIR)/include/polarssl
+	rm -f $(DESTDIR)/lib/libpolarssl.*
+	
+	for p in programs/*/* ; do              \
+	    if [ -x $$p ] && [ ! -d $$p ] ;     \
+	    then                                \
+	        f=$(PREFIX)`basename $$p` ;     \
+	        rm -f $(DESTDIR)/bin/$$f ;      \
+	    fi                                  \
+	done
+
 clean:
 	cd library  && $(MAKE) clean && cd ..
 	cd programs && $(MAKE) clean && cd ..