Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

Conflicts:

	ChangeLog
	testsuite/ChangeLog

1 files changed, 0 insertions, 22 deletions

diff --git a/testsuite/systemtap.examples/small_demos/key.stp b/testsuite/systemtap.examples/small_demos/key.stp
deleted file mode 100755
index 6d2d6c3f..00000000
--- a/testsuite/systemtap.examples/small_demos/key.stp
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env stap
-
-# Useless, but amusing. Based on an idea I saw on a
-# dtrace site. (wav files are from emacs).
-
-// KEY_ENTER = 28
-probe kernel.function("kbd_event") {
-	if ($event_type == 1 && $value) {
-		if ($event_code == 28)
-			system("play return.wav &> /dev/null")
-		else
-			system("play click.wav &> /dev/null")
-	}
-}
-
-probe begin {
-	printf("TYPEWRITER ON\n")
-}
-
-probe end {
-	printf("DONE\n")
-}