Merge with git+ssh://git.ucw.cz/home/mj/GIT/misc.git

diff --cc Makefile
index fa20c23eb18175b773b70bd13f853b959a90fd2a,90348c1260732e9e3af447b6fdd3fb4363ceb5c3..c803277b968195f85045e0ed838b35e35b256d51
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -4,10 -4,9 +4,10 @@@ CFLAGS=-O2 -Wall -W -Wno-parentheses -W
  
  all:
        @echo "Please choose what to make:"
-       @grep '^[^      ]*:' Makefile
+       @grep '^[^      ]*:' Makefile | grep -v =
  
  parrot: parrot.c
 +xclipcat: xclipcat.c
  
  batt: CFLAGS+=$(shell xosd-config --cflags)
  batt: LDFLAGS+=$(shell xosd-config --libs)